Skip to content

Commit 932dfad

Browse files
author
Daniyal Hamid
committed
Updated to PHP8/bitframe 3.5 + Fixed composer scripts
1 parent 8993956 commit 932dfad

20 files changed

+16
-34
lines changed

.dockerignore

100644100755
File mode changed.

.gitattributes

100644100755
File mode changed.

Dockerfile

100644100755
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,18 @@ RUN composer install \
1111
--optimize-autoloader \
1212
--prefer-dist
1313

14-
FROM php:7.4.0-fpm AS base
14+
FROM php:8.0.8-fpm AS base
1515
COPY --from=vendor /usr/bin/composer /usr/bin/composer
1616

1717
RUN apt-get update \
18-
&& apt-get install -y --fix-missing curl vim wget netcat chrpath git unzip zip \
19-
&& pecl -d preferred_state=beta install xdebug \
20-
&& docker-php-ext-enable xdebug \
18+
&& apt-get install -y --fix-missing curl git vim wget netcat chrpath git unzip zip \
2119
&& usermod -u 1000 www-data \
2220
&& usermod -G staff www-data \
2321
&& chown -R www-data:www-data /var/www \
2422
&& chown -R www-data:www-data /var/log \
2523
&& chmod 700 /usr/bin/composer
2624

2725
COPY ./docker/php.ini /usr/local/etc/php/conf.d/99_custom.ini
28-
COPY ./docker/xdebug.ini /usr/local/etc/php/conf.d/
2926

3027
WORKDIR /var/www/html
3128

LICENSE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# License
22

3-
### Copyright (c) 2017-2020 Daniyal Hamid (https://designcise.com)
3+
### Copyright (c) 2017-2021 Daniyal Hamid (https://designcise.com)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

77
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
88

9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1010

1111
### Third-party software used in BitFrame Microframework
1212

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Simply clone the repo and start building your projects.
66

77
### Prerequisites:
88

9-
- BitFrame v2
10-
- PHP 7.4.0+
9+
- BitFrame v3.5
10+
- PHP 8.0+
1111
- Nginx
1212
- Docker Engine 1.13.0+
1313

docker-compose.yml

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ volumes:
44
vendor:
55

66
services:
7-
web:
7+
nginx:
88
image: nginx:latest
99
container_name: bitframe_ngx
1010
ports:

docker/nginx.conf

100644100755
File mode changed.

docker/php.ini

100644100755
File mode changed.

docker/xdebug.ini

Lines changed: 0 additions & 16 deletions
This file was deleted.

www/composer.json

100644100755
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"require": {
3-
"php": ">=7.4.0",
4-
"designcise/bitframe": "^2.0",
5-
"designcise/bitframe-fastroute": "^2.0",
6-
"designcise/bitframe-whoops": "^2.0",
7-
"nyholm/psr7": "^1.2"
3+
"php": ">=8.0",
4+
"designcise/bitframe": "^3.5",
5+
"designcise/bitframe-fastroute": "^3.5",
6+
"designcise/bitframe-whoops": "^3.5",
7+
"nyholm/psr7": "^1.4"
88
},
99
"require-dev": {
1010
"roave/security-advisories": "dev-master",
11-
"phpunit/phpunit": "^8.5",
11+
"phpunit/phpunit": "^9.5",
1212
"squizlabs/php_codesniffer": "3.*",
1313
"phpmd/phpmd": "@stable",
1414
"phpstan/phpstan": "*"
@@ -30,8 +30,9 @@
3030
"sort-packages": true
3131
},
3232
"scripts": {
33-
"style": "vendor/bin/phpcs --standard=PSR12 src",
34-
"check": "vendor/bin/phpstan analyse src --level=5 -c phpstan.neon",
33+
"style": "vendor/bin/phpcs --standard=PSR12 server",
34+
"style-fix": "vendor/bin/phpcbf --standard=PSR12 server",
35+
"check": "vendor/bin/phpstan analyse server --level=5 -c phpstan.neon",
3536
"md": "vendor/bin/phpmd src text cleancode,unusedcode,codesize,design,naming",
3637
"test": "vendor/bin/phpunit --configuration phpunit.xml --testsuite tests"
3738
}

0 commit comments

Comments
 (0)