diff --git a/.travis.yml b/.travis.yml index f36207f..69b2693 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,58 @@ language: php -php: -- 7.1 -- 7.2 -- 7.3 - cache: directories: - $HOME/.composer/cache -before_install: - - composer self-update +env: + global: + - COMPOSER_ARGS="--no-interaction" -install: travis_retry composer update --prefer-dist +matrix: + fast_finish: true + include: + - php: 7.1 + env: + - DEPS=lowest + - php: 7.1 + env: + - DEPS=latest + - php: 7.2 + env: + - DEPS=lowest + - php: 7.2 + env: + - DEPS=latest + - php: 7.3 + env: + - DEPS=lowest + - php: 7.3 + env: + - DEPS=latest + - php: 7.4 + env: + - DEPS=lowest + - php: 7.4 + env: + - DEPS=latest + +addons: + apt: + packages: + - libxml2-utils -script: - - vendor/bin/phpcs - - vendor/bin/phpcs $(find test/fixable/* | sort) --report=summary --report-file=phpcs.log; diff test/expected-report.txt phpcs.log +before_install: + - phpenv config-rm xdebug.ini || return 0 -stages: - - Validate against schema - - Validate fixes - - Test +install: + - travis_retry composer install $COMPOSER_ARGS + - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi + - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi + - stty cols 120 && composer show -jobs: - include: - - stage: Validate against schema - addons: - apt: - packages: - - libxml2-utils - script: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd src/LaminasCodingStandard/ruleset.xml - - - stage: Validate fixes - before_script: - - cp -R test/fixable/ test/fix/ - script: vendor/bin/phpcbf test/fix; diff test/fix test/fixed +script: + - xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd src/LaminasCodingStandard/ruleset.xml + - composer check notifications: email: false diff --git a/CHANGELOG.md b/CHANGELOG.md index f568b95..a6f6f77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 2.0.0rc1 - 2020-01-06 + +### Added + +- Nothing. + +### Changed + +- [#12](https://github.com/laminas/laminas-coding-standard/pull/12) locks dependencies to prevent bugs introduced in newer dependencies. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- [#12](https://github.com/laminas/laminas-coding-standard/pull/12) fixes coding standard name. + ## 2.0.0alpha4 - 2019-11-05 ### Added diff --git a/LICENSE.md b/LICENSE.md index 09f53ed..16fe869 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2019, Laminas Foundation +Copyright (c) 2019-2020, Laminas Foundation All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/composer.json b/composer.json index f2b8aca..51dfcaa 100644 --- a/composer.json +++ b/composer.json @@ -30,8 +30,8 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", "laminas/laminas-zendframework-bridge": "^1.0", "slevomat/coding-standard": "^5.0.4", - "squizlabs/php_codesniffer": "^3.5.1", - "webimpress/coding-standard": "^1.0.5" + "squizlabs/php_codesniffer": "^3.5.3", + "webimpress/coding-standard": "~1.0.6" }, "autoload": { "psr-4": { diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md index b109e9c..dd06cb3 100644 --- a/docs/book/v2/coding-style-guide.md +++ b/docs/book/v2/coding-style-guide.md @@ -28,7 +28,7 @@ This example encompasses some of the rules below as a quick overview: - The Zend Framework coding standard. + name="LaminasCodingStandard"> + The Laminas coding standard. @@ -24,7 +24,7 @@ the first letter of each word is capitalized including the very first letter. --> - + @@ -100,7 +100,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -140,7 +140,7 @@ - + - + - + @@ -247,7 +247,7 @@ - + @@ -290,7 +290,7 @@ even when there are no arguments passed to the constructor. --> - + @@ -351,7 +351,7 @@ taking note of indentation, spacing, and new lines. --> - + @@ -371,7 +371,7 @@ minimum version supports constant visibilities (PHP 7.1 or later). --> - + @@ -396,7 +396,7 @@ - + @@ -444,7 +444,7 @@ question mark and the type. --> - + @@ -457,7 +457,7 @@ declaration. --> - + @@ -501,7 +501,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -599,7 +599,7 @@ - + @@ -610,7 +610,7 @@ used for readability purposes. --> - + - + @@ -706,7 +706,7 @@ the two characters. --> - + @@ -723,7 +723,7 @@ - +