Merge pull request #9 from geekwright/php8testing

Add latest version to unit testing

Author: geekwright

.travis.yml

@@ -3,6 +3,9 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
+  - 8.0
   - nightly
 
 matrix:

composer.json

@@ -22,7 +22,7 @@
   },
   "require-dev": {
     "smarty/smarty": "^3.1",
-    "phpunit/phpunit": "^6.5|^7.0"
+    "phpunit/phpunit": "^7.0|^8.0"
   },
   "autoload": {
     "psr-4": {

src/PoFile.php

@@ -165,7 +165,7 @@ public function addEntry(PoEntry $entry, bool $replace = true): bool
     {
         $key = $this->createKeyFromEntry($entry);
 
-        // some entires, such as obsolete entries, have no key
+        // some entries, such as obsolete entries, have no key
         // for some uses, these are dead weight - need better strategy for that case
         if (empty($key)) {
             $this->unkeyedEntries[] = $entry;
@@ -174,10 +174,10 @@ public function addEntry(PoEntry $entry, bool $replace = true): bool
 
         if (isset($this->entries[$key]) && !$replace) {
             return false;
-        } else {
-            $this->entries[$key] = $entry;
-            return true;
         }
+
+        $this->entries[$key] = $entry;
+        return true;
     }
 
     /**

src/PoHeader.php

@@ -105,12 +105,12 @@ public function setHeader(string $key, string $value): void
     {
         $this->buildStructuredHeaders();
         $lkey = strtolower($key);
+        $newHeader = array('key' => $key, 'value' => $value);
         if (isset($this->structuredHeaders[$lkey])) {
-            $this->structuredHeaders[$lkey]['value'] = $value;
-        } else {
-            $newHeader = array('key' => $key, 'value' => $value);
-            $this->structuredHeaders[$lkey] = $newHeader;
+            $newHeader = $this->structuredHeaders[$lkey];
+            $newHeader['value'] = $value;
         }
+        $this->structuredHeaders[$lkey] = $newHeader;
         $this->storeStructuredHeader();
     }
 

src/PoInitAbstract.php

@@ -172,9 +172,8 @@ public function addPgettextTags($tags): void
      */
     public function msginitFile(string $filename): PoFile
     {
-        if (!is_readable($filename)) {
-            $source = false;
-        } else {
+        $source = false;
+        if (is_readable($filename)) {
             $source = file_get_contents($filename);
         }
         if (false===$source) {

tests/Exceptions/FileNotReadableExceptionTest.php

@@ -15,19 +15,11 @@ class FileNotReadableExceptionTest extends \PHPUnit\Framework\TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp():void
     {
         $this->object = new FileNotReadableException;
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     public function testContracts()
     {
         $this->assertInstanceOf('\Geekwright\Po\Exceptions\FileNotReadableException', $this->object);

tests/Exceptions/FileNotWritableExceptionTest.php

@@ -15,19 +15,11 @@ class FileNotWritableExceptionTest extends \PHPUnit\Framework\TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp():void
     {
         $this->object = new FileNotWritableException;
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     public function testContracts()
     {
         $this->assertInstanceOf('\Geekwright\Po\Exceptions\FileNotWritableException', $this->object);

tests/Exceptions/UnrecognizedInputExceptionTest.php

@@ -15,19 +15,11 @@ class UnrecognizedInputExceptionTest extends \PHPUnit\Framework\TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp():void
     {
         $this->object = new UnrecognizedInputException;
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     public function testContracts()
     {
         $this->assertInstanceOf('\Geekwright\Po\Exceptions\UnrecognizedInputException', $this->object);

tests/PoEntryTest.php

@@ -12,19 +12,11 @@ class PoEntryTest extends \PHPUnit\Framework\TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp():void
     {
         $this->object = new PoEntry;
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     public function testAddGetSet()
     {
         $entry = new PoEntry;

tests/PoFileTest.php

@@ -12,19 +12,11 @@ class PoFileTest extends \PHPUnit\Framework\TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp():void
     {
         $this->object = new PoFile;
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     public function testCreateKey()
     {
         $msgid = 'message';