Merge branch 'master' into 3.0

phingofficial · Dec 21, 2016 · 7693bc4 · 7693bc4
2 parents d2dd036 + 2005dc0
commit 7693bc4
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ language: php
 php:
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 matrix:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,33 @@ P     H     I     N     G
 =========================
 
 
+Dec. , 2016 - Phing 2.16.0
+--------------------------
+
+This release contains the following new or improved functionality:
+
+ * Append, Property, Sleep, Sonar and Truncate tasks
+ * Improved PHP 7.1 compatibility
+ * Various typo and bug fixes, documentation updates
+
+This release will most likely be the last minor update in the 2.x series. Phing 3.x will drop support for PHP < 5.6.
+
+The issues tickets were closed in this release:
+
+ * Relative symlinks \(Trac \#1124\) [\#567](https://github.com/phingofficial/phing/issues/567)
+ * phing should get a strict mode \(Trac \#918\) [\#554](https://github.com/phingofficial/phing/issues/554)
+ * Sass task fails when PEAR is not installed [\#624](https://github.com/phingofficial/phing/issues/624)
+ * PHP notice on 7.1: A non well formed numeric value encountered [\#622](https://github.com/phingofficial/phing/issues/622)
+ * JSHint — Support of specific config file path [\#615](https://github.com/phingofficial/phing/issues/615)
+ * phar file not working - \Symfony\Component\Yaml\Parser' not found [\#614](https://github.com/phingofficial/phing/issues/614)
+ * Git auto modified file with phing vendor [\#613](https://github.com/phingofficial/phing/issues/613)
+ * An issue with 'append' task when adding a list of files in a directory \(v2.15.1\) [\#597](https://github.com/phingofficial/phing/issues/597)
+ * An issue with 'file' attribute of 'append' task \(v2.15.1\) [\#595](https://github.com/phingofficial/phing/issues/595)
+ * JsHintTask fails when reporter attribute is not set \(Trac \#1230\) [\#582](https://github.com/phingofficial/phing/issues/582)
+ * OS detection fails on OSX \(Trac \#1227\) [\#581](https://github.com/phingofficial/phing/issues/581)
+ * stripphpcomments matches links in html \(Trac \#1219\) [\#579](https://github.com/phingofficial/phing/issues/579)
+ * Can not delete git folders on windows \(Trac \#956\) [\#556](https://github.com/phingofficial/phing/issues/556)
+
 Oct. 13, 2016 - Phing 2.15.2
 ----------------------------
 

diff --git a/classes/phing/BuildEvent.php b/classes/phing/BuildEvent.php
@@ -77,7 +77,7 @@ class BuildEvent extends EventObject
     protected $priority = Project::MSG_VERBOSE;
 
     /**
-     * The execption that caused the event, if any
+     * The exception that caused the event, if any
      *
      * @var    object
      */

diff --git a/classes/phing/parser/ProjectConfigurator.php b/classes/phing/parser/ProjectConfigurator.php
@@ -156,7 +156,7 @@ public function isParsing()
      * Creates the ExpatParser, sets root handler and kick off parsing
      * process.
      *
-     * @throws BuildException if there is any kind of execption during
+     * @throws BuildException if there is any kind of exception during
      *                        the parsing process
      */
     protected function parse()

diff --git a/classes/phing/tasks/ext/coverage/CoverageReportTask.php b/classes/phing/tasks/ext/coverage/CoverageReportTask.php
@@ -374,7 +374,7 @@ protected function transformCoverageInformation($filename, $coverageInformation)
 
                 if ($subpackageName !== null) {
                     $this->addSubpackageToPackage($packageName, $subpackageName);
-                    $this->addClassToSubpackage($className, $classElement);
+                    $this->addClassToSubpackage($reflection->getName(), $classElement);
                 } else {
                     $this->addClassToPackage($packageName, $classElement);
                 }