From c6a42955c3ca98a37cc64b80b77ad75dfe00d67e Mon Sep 17 00:00:00 2001 From: Tom Klingenberg Date: Sun, 18 Dec 2016 10:56:25 +0100 Subject: [PATCH 1/4] Typo change execption to exception (#634) Minor mistype/swap of characters. Became aware of in one's of our own projects in which phing was used so caught these as by-catch. Via command line: find . -type f -name '*.php' -exec grep -q execption {} \; \ -exec sed -i 's/execption/exception/g' {} \; -print ./classes/phing/BuildEvent.php ./classes/phing/parser/ProjectConfigurator.php --- classes/phing/BuildEvent.php | 2 +- classes/phing/parser/ProjectConfigurator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/phing/BuildEvent.php b/classes/phing/BuildEvent.php index 682468c3d0..f406bad78f 100644 --- 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 index c60780a77a..66d9b73c52 100644 --- 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() From 4acf5d44c72f90470df4af2f75e925df1456cef2 Mon Sep 17 00:00:00 2001 From: Michiel Rook Date: Tue, 20 Dec 2016 16:23:04 +0100 Subject: [PATCH 2/4] Refs #632 - use full class name when looking for subpackage annotation --- classes/phing/tasks/ext/coverage/CoverageReportTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/phing/tasks/ext/coverage/CoverageReportTask.php b/classes/phing/tasks/ext/coverage/CoverageReportTask.php index 2f73afc340..9a15437e8b 100644 --- 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); } From 56e8b40bd00a39c3cd55d4f6f0acc78cbd87c8bd Mon Sep 17 00:00:00 2001 From: Michiel Rook Date: Wed, 21 Dec 2016 10:32:38 +0100 Subject: [PATCH 3/4] Update changelog for upcoming release --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd025c042c..c5e6f3860e 100644 --- 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 ---------------------------- From 2005dc0afe3a6b36d1de9bce89ba24125ad092f2 Mon Sep 17 00:00:00 2001 From: Michiel Rook Date: Wed, 21 Dec 2016 15:18:01 +0100 Subject: [PATCH 4/4] Add PHP 7.1 to testing matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d8ae3b7656..31e62233f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 - hhvm matrix: