Merge branch 'develop'

Author: Ocramius

.gitignore

@@ -11,6 +11,5 @@ tmp/
 zf-mkdoc-theme/
 clover.xml
 coveralls-upload.json
-phpcs.xml
 phpunit.xml
 vendor

.travis.yml

@@ -15,7 +15,8 @@ cache:
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
     - TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT=true
     - SITE_URL="https://zendframework.github.io/zend-code"
     - GH_USER_NAME="Matthew Weier O'Phinney"
@@ -25,63 +26,45 @@ env:
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.1
       env:
         - DEPS=lowest
-    - php: 5.6
+    - php: 7.1
       env:
         - DEPS=locked
         - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
         - PATH="$HOME/.local/bin:$PATH"
         - TEST_COVERAGE=true
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
         - CHECK_CS=true
-    - php: 7
-      env:
-        - DEPS=latest
-    - php: 7.1
-      env:
-        - DEPS=lowest
-    - php: 7.1
-      env:
-        - DEPS=locked
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: nightly
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: nightly
       env:
         - DEPS=locked
-    - php: hhvm
+    - php: nightly
       env:
         - DEPS=latest
   allow_failures:
-    - php: hhvm
+    - php: nightly
 
 notifications:
-  irc: "irc.freenode.org#zftalk.dev"
   email: false
 
 before_install:
   - travis_retry composer self-update
-  - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || true ; fi
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || true ; fi
 
 install:
   - 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
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update $COMPOSER_ARGS --prefer-lowest --prefer-stable ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - travis_retry composer install $COMPOSER_ARGS
-  - composer show
+  - stty cols 120
+  - COLUMNS=120 composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.2.0 - TBD
+## 3.3.0 - TBD
 
 ### Added
 
@@ -20,23 +20,54 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 3.1.1 - TBD
+## 3.2.0 - 2017-07-23
 
 ### Added
 
-- Nothing.
+- [#112](https://github.com/zendframework/zend-code/pull/112)
+  [#110](https://github.com/zendframework/zend-code/pull/110) Introduced
+  support for the PHP `7.2` `object` type-hint
+- [#41](https://github.com/zendframework/zend-code/pull/41) Added `VarTag`
+  support to the docblock generators and reflectors: allows generating
+  and parsing `@var` tags.
+- [#113](https://github.com/zendframework/zend-code/pull/113) Added
+  PHP `7.2` to the build matrix
+- [#114](https://github.com/zendframework/zend-code/pull/114) Increased
+  minimum supported PHP version to `^7.1.0`
+- [#114](https://github.com/zendframework/zend-code/pull/114) Upgraded
+  PHPUnit dependency to `^6.2.2`
+- [#121](https://github.com/zendframework/zend-code/pull/121) Imported
+  global functions via `use` statements (experimenting with OpCache
+  OPCODE inlining optimisations)
 
 ### Deprecated
 
 - Nothing.
 
 ### Removed
 
-- Nothing.
+- [#113](https://github.com/zendframework/zend-code/pull/113)
+  [#118](https://github.com/zendframework/zend-code/pull/118) Removed
+  HHVM support
+- [#122](https://github.com/zendframework/zend-code/pull/122) Removed
+  IRC notifications for pushes/build statuses
 
 ### Fixed
 
-- Nothing.
+- [#101](https://github.com/zendframework/zend-code/pull/101) avoid
+  calling `isInternalPhpType` twice in the `TypeGenerator`
+- [#115](https://github.com/zendframework/zend-code/pull/115) Replaced
+  assertions in the test suite with their static counterparts where
+  applicable
+- [#120](https://github.com/zendframework/zend-code/pull/120)
+  [#109](https://github.com/zendframework/zend-code/pull/109)
+  [#100](https://github.com/zendframework/zend-code/pull/100) Applied
+  ZendFramework coding standard to the library code
+- [#119](https://github.com/zendframework/zend-code/pull/119) Corrected
+  test suite errors caused by mismatching parameter order
+- [#106](https://github.com/zendframework/zend-code/pull/106)
+- [#107](https://github.com/zendframework/zend-code/pull/107) Minor
+  typing error corrections in documentation and error messages
 
 ## 3.1.0 - 2016-10-24
 

CONTRIBUTING.md

@@ -36,39 +36,30 @@ For sensitive email communications, please use [our PGP key](http://framework.ze
 
 ## RUNNING TESTS
 
-> ### Note: testing versions prior to 2.4
->
-> This component originates with Zend Framework 2. During the lifetime of ZF2,
-> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
-> changes were necessary. However, due to the migration, tests may not run on
-> versions < 2.4. As such, you may need to change the PHPUnit dependency if
-> attempting a fix on such a version.
-
 To run tests:
 
 - Clone the repository:
 
   ```console
-  $ git clone git@github.com:zendframework/zend-code.git
-  $ cd
+  $ git clone git://github.com/zendframework/zend-code.git
+  $ cd zend-code
   ```
 
 - Install dependencies via composer:
 
   ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
+  $ composer install
   ```
 
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
+  If you don't have `composer` installed, please download it from https://getcomposer.org/download/
 
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
+- Run the tests using the "test" command shipped in the `composer.json`:
 
   ```console
-  $ ./vendor/bin/phpunit
+  $ composer test
   ```
 
-You can turn on conditional tests with the phpunit.xml file.
+You can turn on conditional tests with the `phpunit.xml` file.
 To do so:
 
  -  Copy `phpunit.xml.dist` file to `phpunit.xml`
@@ -77,24 +68,22 @@ To do so:
 
 ## Running Coding Standards Checks
 
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
-standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
+First, ensure you've installed dependencies via composer, per the previous
+section on running tests.
 
-To run checks only:
+To run CS checks only:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+$ composer cs-check
 ```
 
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
+To attempt to automatically fix common CS issues:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+$ composer cs-fix
 ```
 
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
+If the above fixes any CS issues, please re-run the tests to ensure
 they pass, and make sure you add and commit the changes after verification.
 
 ## Recommended Workflow for Contributions
@@ -103,12 +92,12 @@ Your first step is to establish a public repository from which we can
 pull your work into the master repository. We recommend using
 [GitHub](https://github.com), as that is where the component is already hosted.
 
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-code)
+1. Setup a [GitHub account](https://github.com/), if you haven't yet
+2. Fork the repository (https://github.com/zendframework/zend-code)
 3. Clone the canonical repository locally and enter it.
 
    ```console
-   $ git clone git://github.com:zendframework/zend-code.git
+   $ git clone git://github.com/zendframework/zend-code.git
    $ cd zend-code
    ```
 

composer.json

@@ -13,15 +13,15 @@
         }
     },
     "require": {
-        "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6",
+        "php": "^7.1",
         "zendframework/zend-eventmanager": "^2.6 || ^3.0"
     },
     "require-dev": {
         "ext-phar": "*",
         "doctrine/annotations": "~1.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "squizlabs/php_codesniffer": "^2.5",
-        "phpunit/PHPUnit": "^4.8.21"
+        "phpunit/phpunit": "^6.2.3",
+        "zendframework/zend-coding-standard": "^1.0.0"
     },
     "suggest": {
         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",