Merge branch 'master' of https://github.com/zendframework/zend-code

* 'master' of https://github.com/zendframework/zend-code: (39 commits)
  Fix Travis code convention
  Fix Travis code convention
  Fix Travis code convention
  Fix Travis code convention
  1. Fix ClassScanner::getInterfaces() which don't work with Interface. 2. add TestCase  ClassScannerTest::testGetInterfacesFromInterface().
  Remove fast_finish flag
  Bumped to next dev version (3.0.5)
  Added CHANGELOG for zendframework#75
  Separated new tests to separate methods
  testCorrectExtendNamesFromGlobalNamespace
  add tests
  Added CHANGELOG for zendframework#59
  Update ClassGenerator.php
  fast fix
  Bumped to next dev version (3.0.4)
  Set date for 3.0.3
  Added CHANGELOG for zendframework#72
  Added CHANGELOG for zendframework#69
  Added CHANGELOG for zendframework#61
  Provide a fix for issue zendframework#70
  ...

.coveralls.yml

@@ -1,3 +1,2 @@
 coverage_clover: clover.xml
 json_path: coveralls-upload.json
-src_dir: src

.gitignore

@@ -9,6 +9,7 @@ nbproject
 
 doc/html/
 tmp/
+zf-mkdoc-theme/
 clover.xml
 composer.lock
 coveralls-upload.json

.travis.yml

@@ -4,27 +4,34 @@ language: php
 
 branches:
   except:
-    - /^release-.*$/
+    - /^release-\d+\.\d+\.\d+.*$/
     - /^ghgfk-.*$/
 
 cache:
   directories:
     - $HOME/.composer/cache
+    - $HOME/.local
+    - zf-mkdoc-theme
 
 env:
   global:
     - TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT=true
+    - SITE_URL=https://zendframework.github.io/zend-code
+    - GH_USER_NAME="Matthew Weier O'Phinney"
+    - GH_USER_EMAIL=matthew@weierophinney.net
+    - GH_REF=github.com/zendframework/zend-code.git
+    - secure: "qgUppUW+xiQunsc07EvrYK7q9j4ewsYzN2ggxxFGaF694gkZ5V29Tb9W2qCkKEdMo6vE+X65P/lOoJceyavPm39/Ka/0V461qIiYX2ZcBVFI/eeVnpwLmU/E5YHn6fFNbiwFX0o4cJdVyTrSspMTXSuiQy+9bLSevDYmbpknR476nmsF8FRGdG6GMFx0XklF1QkoERSfy+FGlqp3VYOJZ2MH7eLhXQyGBKv471kyfmyyInUMVoDN9R8mjJ4Sxyt2qaQ5661DuWRXLaWEBaNOvfZ4++jJFipPLyqIEcE2GqTl9LH3suIBd0NAfHGgdakMJuBZfW3WA/OQ208qm+++qajnI30cxKiGkFoAR2plK9P5+09JAzbivglpEIEtq9a58/I1ahjy9+4sqJYyfxUC07o+REUleJl/ojO6QQ3JI/UUBbPSa3d78Sw9i8LUmLimiYEYQK9zwO1ZdKwJYCKaiYdYS8H0IwGci9t+MqlrllMG5M6f2HRkF1Ph05sWah8QwsGrJ7yiSiILaDHn7wFNvUiN3uw09W9AotQ0AEBzdM6U6CngDPVWKHI9L1d7+txuOLwGt6j8NKHWlgA1P9rMkeMGn2+46b5AlCkUxg6cVCA8ZLpr3a5WLK2F7qTHACtP9tckEb4G3vQjM79f6Nlpewcuc7p7uHWK5Y4UkojRN+U="
 
 matrix:
-  fast_finish: true
   include:
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true
-        - EXECUTE_DOC_CHECK=true
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=true
+        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
+        - PATH="$HOME/.local/bin:$PATH"
     - php: 7
     - php: hhvm 
   allow_failures:
@@ -37,7 +44,6 @@ notifications:
 before_install:
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
-  - if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then composer require --dev --no-update phly/bookdown2mkdocs ; fi
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
 
 install:
@@ -50,7 +56,10 @@ script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
   - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi
-  - if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then make mkdocs ; diff mkdocs.yml mkdocs.yml.orig ; return $? ; fi
+  - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
+
+after_success:
+  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
 
 after_script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; 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.0.2 - TBD
+## 3.0.5 - TBD
 
 ### Added
 
@@ -20,6 +20,82 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 3.0.4 - 2016-06-30
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#59](https://github.com/zendframework/zend-code/pull/59) fixes an issue with
+  detection of multiple trait `use` statements.
+- [#75](https://github.com/zendframework/zend-code/pull/75) provides a patch to
+  ensure that `extends` statements qualify the parent class based on the current
+  namespace and/or import statements.
+
+## 3.0.3 - 2016-06-27
+
+### Added
+
+- [#66](https://github.com/zendframework/zend-code/pull/66) publishes the
+  documentation to https://docs.zendframework.com/zend-code/.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#61](https://github.com/zendframework/zend-code/pull/61) fixes an issue with
+  how parameter typehints were generated; previously, fully-qualified class
+  names were not being generated with the leading backslash, causing them to
+  attempt to resolve as if they were relative to the current namespace.
+- [#69](https://github.com/zendframework/zend-code/pull/69) fixes an issue with
+  how class names under the same namespace are generated when generating
+  typehints, extends, and implements values; they now strip the
+  common namespace from the class name.
+- [#72](https://github.com/zendframework/zend-code/pull/72) fixes an issue
+  within the `TokenArrayScanner` when scanning closures.
+
+## 3.0.2 - 2016-04-20
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#52](https://github.com/zendframework/zend-code/pull/52) updates several
+  dependency constraints:
+  - zend-stdlib now allows either the 2.7 or 3.0 series, as the APIs consumed by
+    zend-code are compatible across versions.
+  - PHP now excludes the 7.0.5 release, as it has known issues in its tokenizer
+    implementation that make the zend-code token scanner unusable.
+- [#46](https://github.com/zendframework/zend-code/pull/46) updates all
+  generators to use `\n` for line endings in generated code, vs `PHP_EOL`,
+  ensuring cross-platform consistency.
+
 ## 3.0.1 - 2016-01-26
 
 ### Added

composer.json

@@ -13,13 +13,13 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6",
         "zendframework/zend-eventmanager": "^2.6 || ^3.0"
     },
     "require-dev": {
         "ext-phar": "*",
         "doctrine/annotations": "~1.0",
-        "zendframework/zend-stdlib": "~2.7",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0",
         "squizlabs/php_codesniffer": "^2.5",
         "phpunit/PHPUnit": "^4.8.21"
     },