From ebe5c8fc6b27f2c12ec68656316392eb113c9772 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 15 Nov 2022 21:34:23 -0300 Subject: [PATCH 1/9] Remove removed constants --- guide/index.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/guide/index.rst b/guide/index.rst index 1408dc5..6c298e9 100644 --- a/guide/index.rst +++ b/guide/index.rst @@ -31,8 +31,6 @@ about the current version of the installed framework: .. code-block:: php echo Aplus::VERSION; - echo Aplus::CODENAME; - echo Aplus::DESCRIPTION; With this package it is possible to create applications according to the need of the developer. From 89fbe7bb12ba74db7caa6526135778153df33e2f Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Wed, 21 Dec 2022 18:48:41 -0300 Subject: [PATCH 2/9] Update CI tests on GitLab --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc7bbe6..b6bcef2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,17 +9,19 @@ variables: test:php: stage: test + timeout: 10 minutes cache: paths: - build/ - vendor/ before_script: - - composer install + - php -v + - composer update script: - composer normalize --dry-run --indent-size=4 --indent-style=space - vendor/bin/php-cs-fixer fix --diff --dry-run --verbose - vendor/bin/phpmd src xml phpmd.xml - - vendor/bin/phpstan analyse -vvv + - vendor/bin/phpstan analyse --xdebug -vvv - vendor/bin/phpunit --colors=never - phpdoc artifacts: @@ -30,6 +32,7 @@ test:php: pages: stage: deploy + timeout: 10 minutes dependencies: - test:php environment: From affc4ed80a092b274c59084e9d0731d238292b69 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Wed, 21 Dec 2022 18:49:33 -0300 Subject: [PATCH 3/9] Add job to test latest PHP version --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6bcef2..4d6dfa6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,20 @@ test:php: - build/docs/ coverage: '/^\s*Lines:\s*\d+.\d+\%/' +test:php-last: + image: registry.gitlab.com/aplus-framework/images/base:3 + stage: test + timeout: 10 minutes + cache: + paths: + - vendor/ + before_script: + - php -v + - composer update + script: + - vendor/bin/phpunit --colors=never + coverage: '/^\s*Lines:\s*\d+.\d+\%/' + pages: stage: deploy timeout: 10 minutes From 9b85a825e449a65c07391601b08d74f8924845ff Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Wed, 21 Dec 2022 18:51:26 -0300 Subject: [PATCH 4/9] Update tests on GitHub Actions --- .github/workflows/tests.yml | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 64eab42..090d486 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,13 +9,12 @@ on: jobs: tests: runs-on: ubuntu-20.04 + timeout-minutes: 10 strategy: fail-fast: true - matrix: - php: ['8.1'] - name: PHP ${{ matrix.php }} + name: PHP 8.1 steps: - name: Checkout @@ -24,7 +23,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} + php-version: 8.1 tools: composer coverage: xdebug @@ -46,7 +45,7 @@ jobs: - name: PHPStan run: - vendor/bin/phpstan analyse -vvv + vendor/bin/phpstan analyse --xdebug -vvv - name: PHPUnit run: vendor/bin/phpunit --verbose @@ -59,4 +58,30 @@ jobs: cp build/coverage/clover.xml build/logs/clover.xml composer global require php-coveralls/php-coveralls php-coveralls --coverage_clover=build/logs/clover.xml -v - if: matrix.php == '8.1' + + tests-last: + runs-on: ubuntu-20.04 + timeout-minutes: 10 + + strategy: + fail-fast: true + + name: PHP 8.2 - Last + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + tools: composer + coverage: xdebug + + - name: Install dependencies + run: + composer update + + - name: PHPUnit + run: vendor/bin/phpunit --verbose From 9b6a25d6a2aed19bc6574916cc946e0d3634a069 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Wed, 21 Dec 2022 18:52:53 -0300 Subject: [PATCH 5/9] Add package-last service --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index a23fbdc..f801e8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,3 +7,10 @@ services: volumes: - .:/package tty: true + package-last: + image: registry.gitlab.com/aplus-framework/images/package:3 + container_name: package-framework-last + working_dir: /package + volumes: + - .:/package + tty: true From 90466b6a133c24488d79b7b88c48741ec253f94b Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Wed, 18 Jan 2023 19:56:25 -0300 Subject: [PATCH 6/9] Use checkout v3 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 090d486..4be6478 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -70,7 +70,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 From de2f5acac9b5eb3e84c5518012b9ddbf52415989 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 27 Jun 2023 14:12:07 -0300 Subject: [PATCH 7/9] Update CI jobs --- .github/workflows/tests.yml | 4 ++-- .gitlab-ci.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4be6478..89d3458 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ on: jobs: tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 10 strategy: @@ -45,7 +45,7 @@ jobs: - name: PHPStan run: - vendor/bin/phpstan analyse --xdebug -vvv + vendor/bin/phpstan analyse -vvv - name: PHPUnit run: vendor/bin/phpunit --verbose diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d6dfa6..fa70f4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ test:php: - composer normalize --dry-run --indent-size=4 --indent-style=space - vendor/bin/php-cs-fixer fix --diff --dry-run --verbose - vendor/bin/phpmd src xml phpmd.xml - - vendor/bin/phpstan analyse --xdebug -vvv + - vendor/bin/phpstan analyse -vvv - vendor/bin/phpunit --colors=never - phpdoc artifacts: From 276d477a32badddd4802fed1aa7ac74dd1d0bc2e Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 27 Jun 2023 14:28:55 -0300 Subject: [PATCH 8/9] Update package versions --- composer.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 52e9048..26c6e58 100644 --- a/composer.json +++ b/composer.json @@ -32,36 +32,36 @@ "php": ">=8.1", "aplus/autoload": "^2.0.2", "aplus/cache": "^3.0.1", - "aplus/cli": "^2.3.1", - "aplus/config": "^3.0.1", - "aplus/crypto": "^1.0.2", - "aplus/database": "^3.2.1", + "aplus/cli": "^2.4.0", + "aplus/config": "^3.0.2", + "aplus/crypto": "^1.0.3", + "aplus/database": "^3.3.0", "aplus/database-extra": "^3.0.1", "aplus/date": "^2.0.1", - "aplus/debug": "^3.3.4", + "aplus/debug": "^3.4.0", "aplus/dev-commands": "^1.0.0", - "aplus/email": "^3.2.1", + "aplus/email": "^3.2.3", "aplus/events": "^1.4.2", "aplus/factories": "^1.0.1", "aplus/helpers": "^3.0.1", - "aplus/http": "^5.2.1", - "aplus/http-client": "^4.2.1", + "aplus/http": "^5.5.0", + "aplus/http-client": "^4.3.1", "aplus/image": "^2.2.3", "aplus/language": "^3.0.2", "aplus/log": "^3.0.1", - "aplus/mvc": "^3.1.0", - "aplus/pagination": "^3.3.0", + "aplus/mvc": "^3.10.0", + "aplus/pagination": "^3.6.0", "aplus/routing": "^3.4.2", - "aplus/session": "^3.2.1", - "aplus/validation": "^2.1.2" + "aplus/session": "^3.2.3", + "aplus/validation": "^2.5.0" }, "require-dev": { "ext-xdebug": "*", - "aplus/coding-standard": "^1.12", - "ergebnis/composer-normalize": "^2.25", - "phpmd/phpmd": "^2.12", - "phpstan/phpstan": "^1.5", - "phpunit/phpunit": "^9.5" + "aplus/coding-standard": "^1.14", + "ergebnis/composer-normalize": "^2.31", + "phpmd/phpmd": "^2.13", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.6" }, "minimum-stability": "dev", "prefer-stable": true, From 3dce1c27542ef366443af5bc7b02984d503bf289 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 27 Jun 2023 14:29:30 -0300 Subject: [PATCH 9/9] Update Aplus version --- src/Aplus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Aplus.php b/src/Aplus.php index 0b3a916..1b4d964 100644 --- a/src/Aplus.php +++ b/src/Aplus.php @@ -19,5 +19,5 @@ final class Aplus * * @var string */ - public const VERSION = '23.0.0'; + public const VERSION = '23.0.1'; }