Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
bf5ce80
Bump CakePHP version to 3.x
bancer Aug 24, 2023
1a97d60
Merge branch '3.x' of https://github.com/lecterror/cakephp-filter-plu…
bancer Aug 24, 2023
4022fe4
Migrate to 3.x
bancer Aug 28, 2023
7c2bc0f
Run composer install
bancer Aug 28, 2023
177bba1
Adjust CI commands
bancer Aug 28, 2023
2a73ad4
Adjust CI command
bancer Aug 28, 2023
be8916c
Relax requirements in composer.json
bancer Aug 28, 2023
509b6be
Adjust CI commands
bancer Aug 28, 2023
e5e9d20
Remove unnecessary commas
bancer Aug 28, 2023
80aef74
Adjust CI commands
bancer Aug 28, 2023
39ce812
Adjust CI commands
bancer Aug 28, 2023
0472cf0
Adjust CI commands
bancer Aug 28, 2023
d993cc9
Adjust CI command
bancer Aug 28, 2023
28db821
Adjust CI command
bancer Aug 28, 2023
94ce4c3
Adjust CI commands
bancer Aug 28, 2023
6c365da
Adjust CI command
bancer Aug 28, 2023
17be421
Simplify CI config
bancer Aug 28, 2023
bd23fec
Adjust CI commands
bancer Aug 28, 2023
cb7a620
Fix code style errors
bancer Aug 28, 2023
6347def
Rollback composer changes
bancer Aug 28, 2023
ba5d599
Update CI command
bancer Aug 28, 2023
fb1f707
Install phpcs
bancer Aug 28, 2023
21a1cdc
Adjust CI command
bancer Aug 28, 2023
1f97a14
Set phpcs standard path
bancer Aug 28, 2023
509e407
Replace tabs with spaces
bancer Aug 28, 2023
60c38f5
Replace tabs with spaces
bancer Aug 28, 2023
366f23f
Fix code style errors in ItemsFixture
bancer Aug 28, 2023
ec35d9c
Fix code style errors in test files
bancer Aug 28, 2023
a08a3d8
Fix code style errors in FilteredBehavior
bancer Aug 28, 2023
7328d26
Fix code style errors in FilterHelper
bancer Aug 28, 2023
6f10f31
Fix code style errors in FilterComponent
bancer Aug 28, 2023
a981985
Fix code style errors
bancer Aug 28, 2023
9eac0b4
Fix code style errors
bancer Aug 28, 2023
02df8f4
Add ctp files to code style checks
bancer Aug 28, 2023
1a31137
Fix code style errors
bancer Aug 28, 2023
650bc1f
Fix code style errors
bancer Aug 29, 2023
2bc1d32
Update readme file
bancer Aug 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions .github/actions/setup-cakephp/action.yml

This file was deleted.

55 changes: 0 additions & 55 deletions .github/actions/setup-database/action.yml

This file was deleted.

46 changes: 28 additions & 18 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@ jobs:
mysql-version: '5.6'
- name: Check out repository code
uses: actions/checkout@v3
- name: Setup CakePHP
uses: ./.github/actions/setup-cakephp
- name: Setup database
uses: ./.github/actions/setup-database
- name: Install PHPUnit
- name: Install Dependencies
run: |
cd ./cakephp
composer require 'phpunit/phpunit=5.7'
cd ../
composer remove --dev phpstan/phpstan cakephp/cakephp-codesniffer overtrue/phplint --no-update
composer require 'cakephp/cakephp=3.10.5' 'phpunit/phpunit=5.7.0' --with-all-dependencies
shell: bash
- name: Create test database
run: mysql -u root -e "CREATE DATABASE cakephp_test"
shell: bash

- name: Unit Tests
run: ./cakephp/lib/Cake/Console/cake test Filter All --stderr -app ./cakephp/app
run: ./vendor/bin/phpunit ./tests

PHP-Lint:
runs-on: ubuntu-latest
Expand All @@ -58,13 +57,24 @@ jobs:
php-version: 7.4
- name: Check out repository code
uses: actions/checkout@v3
- name: Setup CakePHP
uses: ./.github/actions/setup-cakephp
- name: Install PHPUnit
run: composer require 'phpunit/phpunit=7.0'
- name: Install PHPStan
run: |
composer require --dev phpstan/phpstan
composer require --dev phpstan/phpstan-phpunit
- name: Install Dependencies
run: composer require 'cakephp/cakephp=3.10.5' 'phpunit/phpunit=7.0' phpstan/phpstan phpstan/phpstan-phpunit --with-all-dependencies
- name: PHPStan
run: vendor/bin/phpstan analyse --level=8 ./cakephp/plugins/Filter
run: vendor/bin/phpstan analyse --level=8 ./src ./tests

PHP-Code-Sniffer:
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 5.6
- name: Check out repository code
uses: actions/checkout@v3
- name: Install PHPCS
run: |
composer remove --dev phpstan/phpstan phpunit/phpunit overtrue/phplint --no-update
composer require cakephp/cakephp-codesniffer
vendor/bin/phpcs --config-set installed_paths /home/runner/work/cakephp-filter-plugin/cakephp-filter-plugin/vendor/cakephp/cakephp-codesniffer
- name: Run PHPCS
run: vendor/bin/phpcs --colors --parallel=16 -p --standard=CakePHP --extensions=php,ctp src/ tests/
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/.settings/
/.buildpath
/.project
/.phplint-cache
/composer.lock
/vendor/
Loading