Go PHP 7.1

Author: geekwright

.gitignore

@@ -3,6 +3,6 @@
 \#*
 *.bak
 .idea/
-coverage.clover
-composer.lock
 vendor/
+composer.lock
+coverage.clover

.travis.yml

@@ -1,28 +1,20 @@
 language: php
 
 php:
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
   - nightly
 
+matrix:
+  allow_failures:
+    - php: nightly
+
 install:
   - composer install
 
 script:
-  - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.clover
+  - vendor/bin/phpunit
 
 after_script:
   - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
   - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
-
-matrix:
-  include:
-    - php: 5.3
-      dist: precise
-  allow_failures:
-    - php: nightly

composer.json

@@ -10,19 +10,19 @@
   ],
   "homepage": "https://github.com/geekwright/Po",
   "type": "library",
-  "license": "GPL-2.0+",
+  "license": "GPL-2.0-or-later",
   "authors": [
     {
       "name": "Richard Griffith",
       "email": "richard@geekwright.com"
     }
   ],
   "require": {
-    "php": ">=5.3.0",
-    "smarty/smarty": "^3.1"
+    "php": ">7.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.8.*|5.*"
+    "smarty/smarty": "^3.1",
+    "phpunit/phpunit": "^6.5|^7.0"
   },
   "autoload": {
     "psr-4": {

phpunit.xml.dist

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
+    <testsuites>
+        <testsuite name="po">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-clover" target="coverage.clover" />
+    </logging>
+</phpunit>

src/Exceptions/FileNotReadableException.php

@@ -10,10 +10,10 @@
  * @category  Exceptions
  * @package   Po
  * @author    Richard Griffith <richard@geekwright.com>
- * @copyright 2015 Richard Griffith
+ * @copyright 2015-2018 Richard Griffith
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://github.com/geekwright/Po
  */
-class FileNotReadableException extends \Exception
+class FileNotReadableException extends \RuntimeException
 {
 }

src/Exceptions/FileNotWritableException.php

@@ -10,10 +10,10 @@
  * @category  Exceptions
  * @package   Po
  * @author    Richard Griffith <richard@geekwright.com>
- * @copyright 2015 Richard Griffith
+ * @copyright 2015-2018 Richard Griffith
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://github.com/geekwright/Po
  */
-class FileNotWritableException extends \Exception
+class FileNotWritableException extends \RuntimeException
 {
 }

src/Exceptions/UnrecognizedInputException.php

@@ -11,7 +11,7 @@
  * @category  Exceptions
  * @package   Po
  * @author    Richard Griffith <richard@geekwright.com>
- * @copyright 2015 Richard Griffith
+ * @copyright 2015-2018 Richard Griffith
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://github.com/geekwright/Po
  */

src/PoEntry.php

@@ -10,7 +10,7 @@
  * @category  Entries
  * @package   Po
  * @author    Richard Griffith <richard@geekwright.com>
- * @copyright 2015 Richard Griffith
+ * @copyright 2015-2018 Richard Griffith
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://github.com/geekwright/Po
  */
@@ -45,7 +45,7 @@ public function __construct()
      * @param string $value value to store
      * @return void
      */
-    public function add($type, $value)
+    public function add(string $type, string $value): void
     {
         if ($this->entry[$type] === null) {
             $this->entry[$type] = array();
@@ -61,7 +61,7 @@ public function add($type, $value)
      * @param string $value value to store
      * @return void
      */
-    public function addQuoted($type, $value)
+    public function addQuoted(string $type, string $value): void
     {
         if ($value[0]=='"') {
             $value = substr($value, 1, -1);
@@ -86,7 +86,7 @@ public function addQuoted($type, $value)
      * @param string  $value    value to store
      * @return void
      */
-    public function addQuotedAtPosition($type, $position, $value)
+    public function addQuotedAtPosition(string $type, int $position, string $value): void
     {
         if ($value[0]=='"') {
             $value = substr($value, 1, -1);
@@ -111,7 +111,7 @@ public function addQuotedAtPosition($type, $position, $value)
      *
      * @return string|string[]|null
      */
-    public function get($type)
+    public function get(string $type)
     {
         return $this->entry[$type];
     }
@@ -122,7 +122,7 @@ public function get($type)
      * @param string $type PoToken constant
      * @return string|null
      */
-    public function getAsString($type)
+    public function getAsString(string $type): ?string
     {
         $ret = $this->entry[$type];
         if (is_array($ret)) {
@@ -139,7 +139,7 @@ public function getAsString($type)
      *
      * @return string[]|null
      */
-    public function getAsStringArray($type)
+    public function getAsStringArray(string $type): ?array
     {
         $plurals = $this->entry[$type];
         $plurals = is_array($plurals) ? $plurals : array('', '');
@@ -156,11 +156,11 @@ public function getAsStringArray($type)
     /**
      * set the value of a specified type
      *
-     * @param string $type  PoToken constant
-     * @param string $value value to set
+     * @param string               $type  PoToken constant
+     * @param string|string[]|null $value value to set
      * @return void
      */
-    public function set($type, $value)
+    public function set(string $type, $value): void
     {
         $this->entry[$type] = $value;
     }
@@ -170,7 +170,7 @@ public function set($type, $value)
      *
      * @return string
      */
-    public function dumpEntry()
+    public function dumpEntry(): string
     {
         $output = $this->dumpEntryComments();
 
@@ -205,7 +205,7 @@ public function dumpEntry()
      *
      * @return string
      */
-    protected function dumpEntryComments()
+    protected function dumpEntryComments(): string
     {
         $commentKeys = array(
             PoTokens::TRANSLATOR_COMMENTS,
@@ -236,13 +236,13 @@ protected function dumpEntryComments()
      * format a string for output by escaping control and double quote
      * characters, then surrounding with double quotes
      *
-     * @param string|null $value string to prepare
-     * @param boolean     $bare  true for bare output, default false adds leading
-     *                           space and trailing newline
+     * @param string|string[]|null $value string to prepare
+     * @param boolean              $bare  true for bare output, default false adds leading
+     *                                    space and trailing newline
      *
      * @return string
      */
-    protected function formatQuotedString($value, $bare = false)
+    protected function formatQuotedString($value, bool $bare = false): string
     {
         if (is_array($value)) {
             $string = '';
@@ -266,7 +266,7 @@ protected function formatQuotedString($value, $bare = false)
      *
      * @return boolean true if flag is set, otherwise false
      */
-    public function hasFlag($name)
+    public function hasFlag(string $name): bool
     {
         $flags = array();
         $flagEntry = $this->entry[PoTokens::FLAG];
@@ -290,7 +290,7 @@ public function hasFlag($name)
      *
      * @return void
      */
-    public function addFlag($name)
+    public function addFlag(string $name): void
     {
         if (!$this->hasFlag($name)) {
             $flagEntry = $this->entry[PoTokens::FLAG];