From 647f29e35bb1304567e03f607add745984514d24 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Sat, 24 Aug 2019 23:03:58 +0300 Subject: [PATCH 1/5] Use PSR-12 instead since PSR-2 is now deprecated --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b828a31a..c9fcd37d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist script: - - vendor/bin/phpcs --standard=psr2 src/ + - vendor/bin/phpcs --standard=psr12 src/ - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover after_script: From ef02cd0e301839d7ab95709ffe33ea62eece9e7c Mon Sep 17 00:00:00 2001 From: Mponos George Date: Sat, 24 Aug 2019 23:44:01 +0300 Subject: [PATCH 2/5] Use PSR-12 instead of PSR-2 --- .styleci.yml | 2 +- .travis.yml | 2 +- CONTRIBUTING.md | 2 +- phpcs.xml.dist | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index 247a09c5..ac8d6063 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -1 +1 @@ -preset: psr2 +preset: psr12 diff --git a/.travis.yml b/.travis.yml index c9fcd37d..2ee53da7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist script: - - vendor/bin/phpcs --standard=psr12 src/ + - vendor/bin/phpcs --standard=psr12 src/ tests/ - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover after_script: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 126fc7fb..46471539 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ We accept contributions via Pull Requests on [Github](https://github.com/:vendor ## Pull Requests -- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - Check the code style with ``$ composer check-style`` and fix it with ``$ composer fix-style``. +- **[PSR-12 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md)** - Check the code style with ``$ composer check-style`` and fix it with ``$ composer fix-style``. - **Add tests!** - Your patch won't be accepted if it doesn't have tests. diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 989f8408..afa27cc8 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,6 +9,6 @@ - - - \ No newline at end of file + + + From 1fbf7e1977bbb29f75de1b4dcf1b2d4c0ef874c4 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Sat, 24 Aug 2019 23:45:31 +0300 Subject: [PATCH 3/5] User codesniffer greater than 3.3 for PSR-12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cbab4f3d..990b0546 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "phpunit/phpunit" : ">=7.0", - "squizlabs/php_codesniffer": "^3.0" + "squizlabs/php_codesniffer": "^3.3" }, "autoload": { "psr-4": { From f0fcefa14a49dcfdc08a76b2112f4efa5fb1df64 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Wed, 9 Oct 2019 20:29:50 +0300 Subject: [PATCH 4/5] updated codesniffer version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 990b0546..f9d56d0d 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "phpunit/phpunit" : ">=7.0", - "squizlabs/php_codesniffer": "^3.3" + "squizlabs/php_codesniffer": "^3.5" }, "autoload": { "psr-4": { From 67efaac7442d7dfb3cd0e6efbbb0192f7d190d61 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Fri, 19 Jun 2020 17:59:03 +0300 Subject: [PATCH 5/5] Updated URL --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46471539..3b93891d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ We accept contributions via Pull Requests on [Github](https://github.com/:vendor ## Pull Requests -- **[PSR-12 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md)** - Check the code style with ``$ composer check-style`` and fix it with ``$ composer fix-style``. +- **[PSR-12 Coding Standard](https://www.php-fig.org/psr/psr-12/)** - Check the code style with ``$ composer check-style`` and fix it with ``$ composer fix-style``. - **Add tests!** - Your patch won't be accepted if it doesn't have tests.