Merge branch 'develop'

Conflicts:
	composer.json

.gitignore

@@ -11,7 +11,6 @@ vendor/*
 composer.phar
 data/templates/*
 .vagrant
-composer.phar
 /nbproject/private/
 box.phar
 phpunit.xml

.travis.yml

@@ -5,6 +5,13 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - hhvm
+  - hhvm-nightly
+
+matrix:
+    allow_failures:
+        - php: hhvm
+        - php: hhvm-nightly
 
 script:
  - bin/phpunit
@@ -15,10 +22,10 @@ before_script:
  - sudo apt-get -qq install graphviz > /dev/null
  - phpenv rehash > /dev/null
  - composer selfupdate --quiet
- - composer install -n --prefer-source --dev
+ - composer install --no-interaction --prefer-source --dev
  - bin/phpunit
 # - bin/behat --no-paths --format failed
- - composer update -n --prefer-source --dev
+ - composer update --no-interaction --prefer-source --dev
 
 notifications:
   irc: "irc.freenode.org#phpdocumentor"

CHANGELOG.md

@@ -1,3 +1,12 @@
+Unreleased
+----------
+
+```
+FIXED:     #423: Error report in responsive and responsive-twig template should hide empty results and update error
+           counter next to the filename.
+FIXED:     #573: Visibility filters in 'responsive' and 'responsive-twig' do not function properly
+```
+
 2014/08/18: Version 2.7.0
 -------------------------
 

ansible/roles/phpdocumentor.php/tasks/main.yml

@@ -19,4 +19,3 @@
 - name: Install composer
   shell: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer creates=/usr/local/bin/composer
   sudo: True
-

ansible/roles/phpdocumentor.release/tasks/main.yml

@@ -2,6 +2,13 @@
 - name:  Clone clean repository into 'release' folder
   shell: git clone git@github.com:phpDocumentor/phpDocumentor2.git release
 
+- name:  Set commit author name and mail address
+  shell: "{{ item }}"
+  with_items:
+      - git config user.name phpDocumentor
+      - git config user.email info@phpdoc.org
+  args: { chdir: release }
+
 - name: Install all dependencies using Composer
   shell: composer install -o --no-dev --prefer-dist -n
   args: { chdir: release }
@@ -10,7 +17,7 @@
   shell: "{{ item }}"
   with_items:
       - wget -nc https://github.com/mvriel/Versioner/releases/download/1.0.0/versioner.phar
-      - php versioner.phar increment VERSION
+      - php versioner.phar increment -p {{ release_type }} VERSION
       - rm versioner.phar
   args: { chdir: release }
 
@@ -19,20 +26,17 @@
   register: VERSION
   args: { chdir: release }
 
-- name: Retrieve new version number
-  shell: git commit VERSION -m "Upped version number to {{VERSION.stdout}}" --author="phpDocumentor <info@phpdoc.org>"
-  args: { chdir: release }
-
-- name: Update master with develop branch
-  shell: git checkout master
-  args: { chdir: release }
-
-- name: Update master with develop branch
-  shell: git merge develop
+- name: Store new version number
+  shell: git commit VERSION -m "Upped version number to {{VERSION.stdout}}"
   args: { chdir: release }
 
 - name: Update master with develop branch
-  shell: git push origin master
+  shell: "{{ item }}"
+  with_items:
+      - git push origin develop
+      - git checkout master
+      - git merge develop
+      - git push origin master
   args: { chdir: release }
 
 - name: Tag new version
@@ -48,7 +52,7 @@
   args: { chdir: release }
 
 - name: Move PEAR package to channel folder
-  shell: mv phpDocumentor-{{ VERSION.stdout }}.tgz ~ # /var/www/pear.phpdoc.org/web/
+  shell: mv phpDocumentor-{{ VERSION.stdout }}.tgz /var/www/pear.phpdoc.org/web/
   args: { chdir: release }
 
 - name: Register new PEAR package with channel
@@ -64,12 +68,15 @@
   args: { chdir: release }
 
 - name: Deploy phar to website
-  shell: mv phpDocumentor.phar ~ # /var/www/phpdoc.org/web/phpDocumentor.phar
+  shell: mv phpDocumentor.phar /var/www/phpdoc.org/web/phpDocumentor.phar
+  args: { chdir: release }
+
+- name: Archive new phar to archive folder
+  shell: mv phpDocumentor.phar /opt/artifacts/phpdoc.org/phar/phpDocumentor-{{ VERSION.stdout }}.phar
   args: { chdir: release }
 
-#- name: Archive new phar to archive folder
-#  shell: cp /var/www/phpdoc.org/web/phpDocumentor.phar /opt/artifacts/phpdoc.org/phar/phpDocumentor-{{ VERSION.stdout }}.phar
+- name: Update symlink to latest phar file
+  shell: ln -fs /opt/artifacts/phpdoc.org/phar/phpDocumentor-{{ VERSION.stdout }}.phar /opt/artifacts/phpdoc.org/phar/phpDocumentor-latest.phar
 
 - name:  Remove 'release' folder
   shell: rm -rf release
-

bin/utils/package.php

@@ -146,7 +146,6 @@ function createPackager($original_file, $options = array())
     return $packagexml;
 }
 
-
 echo 'phpDocumentor PEAR Packager v1.0'.PHP_EOL;
 
 if ($argc < 4) {

box.json

@@ -56,16 +56,14 @@
         ]
     },
     "chmod": "0755",
-    "compactors": [
-        "Herrera\\Box\\Compactor\\Php"
-    ],
     "directories": [
         "src",
         "vendor/twig/twig/lib/Twig/Node/Expression/Test"
     ],
     "directories-bin": ["data"],
     "files": [
         "vendor/autoload.php",
+        "vendor/herrera-io/phar-update/res/schema.json",
         "VERSION"
     ],
     "finder": [
@@ -148,7 +146,8 @@
             ]
         }
     ],
+    "git-version": "package_version",
     "main": "bin/phpdoc",
     "output": "phpDocumentor.phar",
     "stub": true
-}
+}

composer.json

@@ -28,7 +28,8 @@
         "symfony/stopwatch":        "~2.3",
         "symfony/config":           "~2.3",
         "jms/serializer":           "~0.12",
-        "knplabs/knp-menu":         "~1.1",
+
+        "herrera-io/phar-update": "1.0.3",
 
         "zendframework/zend-stdlib":         "~2.1",
         "zendframework/zend-servicemanager": "~2.1",
@@ -56,8 +57,8 @@
     "minimum-stability": "stable",
     "require-dev": {
         "behat/behat":        "~2.4",
-        "phpunit/phpunit":    "~3.7",
-        "mockery/mockery":    "dev-master#1b3b265a904cab6f28b72684d7d62abade836e25",
+        "phpunit/phpunit":    "~4.0",
+        "mockery/mockery":    "~0.9@dev",
         "mikey179/vfsStream": "~1.2",
         "squizlabs/php_codesniffer": "~1.4",
         "symfony/expression-language": "~2.4"
@@ -72,7 +73,7 @@
     "bin": ["bin/phpdoc.php", "bin/phpdoc"],
     "extra": {
         "branch-alias": {
-            "dev-develop": "2.6-dev"
+            "dev-develop": "2.9-dev"
         }
     }
 }