Merge remote-tracking branch 'remotes/origin/develop'

Roman Syroeshko · Roman Syroeshko · commit c9be70c80637 · 2016-07-07T21:26:55.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,3 +38,8 @@
 
 ### Features
 - Added Zip Adapters (PclZip & ZipArchive)
+
+## 0.2.6
+
+### Changes
+- `\PhpOffice\Common\Text::utf8ToUnicode()` became `public`.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.4
+0.2.6
diff --git a/phpmd.xml.dist b/phpmd.xml.dist
@@ -4,11 +4,24 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
     xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-    <rule ref="rulesets/naming.xml"/>
+    <rule ref="rulesets/naming.xml">
+        <exclude name="LongVariable" />
+    </rule>
+    <rule ref="rulesets/naming.xml/LongVariable">
+        <properties>
+            <property name="maximum" value="32" />
+        </properties>
+    </rule>
     <rule ref="rulesets/design.xml/ExitExpression" />
     <rule ref="rulesets/design.xml/EvalExpression" />
     <rule ref="rulesets/design.xml/GotoStatement" />
     <rule ref="rulesets/design.xml/DepthOfInheritance" />
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects">
+        <!-- AbstractContainer needs more coupling (default: 13) -->
+        <properties>
+            <property name="minimum" value="20" />
+        </properties>
+    </rule>
     <rule ref="rulesets/design.xml/NumberOfChildren">
         <!-- AbstractStyle needs more children (default: 15) -->
         <properties>
diff --git a/src/Common/Autoloader.php b/src/Common/Autoloader.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/Common/Drawing.php b/src/Common/Drawing.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/Common/File.php b/src/Common/File.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/Common/Font.php b/src/Common/Font.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/Common/Microsoft/OLERead.php b/src/Common/Microsoft/OLERead.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/Common/Text.php b/src/Common/Text.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -162,7 +162,7 @@ public static function toUnicode($text)
      * @since 0.11.0
      * @link http://www.randomchaos.com/documents/?source=php_and_unicode
      */
-    private static function utf8ToUnicode($text)
+    public static function utf8ToUnicode($text)
     {
         $unicode = array();
         $values = array();
diff --git a/src/Common/XMLReader.php b/src/Common/XMLReader.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/Common/XMLWriter.php b/src/Common/XMLWriter.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/Common/Tests/AutoloaderTest.php b/tests/Common/Tests/AutoloaderTest.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/Common/Tests/DrawingTest.php b/tests/Common/Tests/DrawingTest.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/Common/Tests/FileTest.php b/tests/Common/Tests/FileTest.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/Common/Tests/FontTest.php b/tests/Common/Tests/FontTest.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/Common/Tests/TextTest.php b/tests/Common/Tests/TextTest.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/Common/Tests/XMLWriterTest.php b/tests/Common/Tests/XMLWriterTest.php
@@ -10,7 +10,7 @@
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
  * @link        https://github.com/PHPOffice/Common
- * @copyright   2009-2014 PHPOffice Common contributors
+ * @copyright   2009-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/Common/Tests/_includes/XmlDocument.php b/tests/Common/Tests/_includes/XmlDocument.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPPowerPoint/contributors.
  *
  * @link        https://github.com/PHPOffice/PHPPowerPoint
- * @copyright   2010-2014 PHPPowerPoint contributors
+ * @copyright   2010-2016 PHPPowerPoint contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/Common/contributors.
  *
- * @copyright   2010-2014 PHPOffice Common contributors
+ * @copyright   2010-2016 PHPOffice Common contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  * @link        https://github.com/PHPOffice/Common
  */

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* contributors, visit https://github.com/PHPOffice/Common/contributors.`
`11`	`11`	`*`
`12`	`12`	`* @link https://github.com/PHPOffice/Common`
`13`		`- * @copyright 2009-2014 PHPOffice Common contributors`
	`13`	`+ * @copyright 2009-2016 PHPOffice Common contributors`
`14`	`14`	`* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3`
`15`	`15`	`*/`
`16`	`16`