allow symfony 3, use phpunit 6, raise minimum php version to 7.1, ref… (#11)

* allow symfony 3, use phpunit 6, raise minimum php version to 7.1, refactorings and bugfixes
* fix travis config

Author: temp

.travis.yml

@@ -1,18 +1,21 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
-  - 7
-  - hhvm
+  - 7.1
+  - nightly
+
+matrix:
+  allow_failures:
+    - php:
+        - nightly
 
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y p7zip-full
 
 before_script: composer install 
 
-script: vendor/bin/phpunit -c tests --coverage-clover=coverage.clover
+script: vendor/bin/phpunit tests --coverage-clover=coverage.clover
 
 after_script:
-  - sh -c 'if [ $(phpenv version-name) = "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi;'
+  - sh -c 'if [ $(phpenv version-name) = "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi;'

CHANGELOG

@@ -0,0 +1,4 @@
+3.0
+
+- DecoderResolver::addDecoder() is now private
+- EncoderResolver::addDecoder() is now private

composer.json

@@ -19,18 +19,22 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "psr/log": "~1.0",
-        "symfony/process": "~2.3"
+        "php": "^7.1",
+        "psr/log": "^1.0",
+        "symfony/process": "^2.8|^3.0"
     },
     "require-dev": {
-        "php": ">=5.5.0",
-        "phpunit/phpunit": "~4.5"
+        "phpunit/phpunit": "^6.0"
     },
     "autoload": {
         "psr-4": { "Brainbits\\Transcoder\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Brainbits\\Transcoder\\Tests\\": "tests/" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.0-dev"
+        }
     }
 }

tests/phpunit.xml.dist phpunit.xml.disttests/phpunit.xml.dist renamed to phpunit.xml.dist

@@ -5,12 +5,12 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          syntaxCheck="true">
-    <testsuite name="brainbits">
-        <directory>.</directory>
+    <testsuite name="transcoder">
+        <directory>tests</directory>
     </testsuite>
     <filter>
         <whitelist>
-            <directory suffix=".php">../src/</directory>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 </phpunit>

src/Decoder/Bzip2Decoder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder package.
  *
@@ -14,18 +16,13 @@
 use Brainbits\Transcoder\Exception\DecodeFailedException;
 
 /**
- * Bzip2 decoder
- *
- * @author Gregor Welters <gwelters@brainbits.net>
+ * Bzip2 decoder.
  */
 class Bzip2Decoder implements DecoderInterface
 {
     const TYPE = 'bzip2';
 
-    /**
-     * @inheritDoc
-     */
-    public function decode($data)
+    public function decode(string $data): string
     {
         $data = bzdecompress($data);
 
@@ -40,10 +37,7 @@ public function decode($data)
         return $data;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function supports($type)
+    public function supports(?string $type): bool
     {
         return self::TYPE === $type;
     }
@@ -53,7 +47,7 @@ public function supports($type)
      *
      * @return bool
      */
-    private function isErrorCode($result)
+    private function isErrorCode($result): bool
     {
         return $result === -1 || $result === -2 || $result === -3 || $result === -5 || $result === -6 ||
             $result === -7 || $result === -8 || $result === -9;

src/Decoder/DecoderInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder package.
  *
@@ -12,25 +14,17 @@
 namespace Brainbits\Transcoder\Decoder;
 
 /**
- * Decoder interface
- *
- * @author Gregor Welters <gwelters@brainbits.net>
+ * Decoder interface.
  */
 interface DecoderInterface
 {
     /**
-     * Decode data
-     *
-     * @param string $data
-     * @return string
+     * Decode data.
      */
-    public function decode($data);
+    public function decode(string $data): string;
 
     /**
-     * Returns true if type is supported, false otherwise
-     *
-     * @param string $type
-     * @return boolean
+     * Returns true if type is supported, false otherwise.
      */
-    public function supports($type);
+    public function supports(?string $type): bool;
 }

src/Decoder/DecoderResolver.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder package.
  *
@@ -11,12 +13,11 @@
 
 namespace Brainbits\Transcoder\Decoder;
 
+use RuntimeException;
+
 /**
- * Decoder resolver
- * Resolves decoders based on supported type
- *
- * @author Stephan Wentz <swentz@brainbits.net>
- * @author Gregor Welters <gwelters@brainbits.net>
+ * Decoder resolver.
+ * Resolves decoders based on supported type.
  */
 class DecoderResolver implements DecoderResolverInterface
 {
@@ -30,34 +31,24 @@ class DecoderResolver implements DecoderResolverInterface
      */
     public function __construct(array $decoders = array())
     {
-        $this->decoders = $decoders;
-    }
-
-    /**
-     * Add decoder
-     *
-     * @param DecoderInterface $decoder
-     * @return $this
-     */
-    public function addDecoder(DecoderInterface $decoder)
-    {
-        $this->decoders[] = $decoder;
-
-        return $this;
+        foreach ($decoders as $decoder) {
+            $this->addDecoder($decoder);
+        }
     }
 
-    /**
-     * @inheritDoc
-     * @throws \RuntimeException
-     */
-    public function resolve($type)
+    public function resolve(?string $type): DecoderInterface
     {
         foreach ($this->decoders as $decoder) {
             if ($decoder->supports($type)) {
                 return $decoder;
             }
         }
 
-        throw new \RuntimeException("No decoder supports the requested type $type");
+        throw new RuntimeException("No decoder supports the requested type $type");
+    }
+
+    private function addDecoder(DecoderInterface $decoder): void
+    {
+        $this->decoders[] = $decoder;
     }
 }

src/Decoder/DecoderResolverInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder package.
  *
@@ -12,16 +14,10 @@
 namespace Brainbits\Transcoder\Decoder;
 
 /**
- * Decoder resolver interface
- * Resolves decoders based on supported type
- *
- * @author Stephan Wentz <swentz@brainbits.net>
+ * Decoder resolver interface.
+ * Resolves decoders based on supported type.
  */
 interface DecoderResolverInterface
 {
-    /**
-     * @param string|null $type
-     * @return DecoderInterface
-     */
-    public function resolve($type);
+    public function resolve(?string $type): DecoderInterface;
 }

src/Decoder/DeflateDecoder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder package.
  *
@@ -14,18 +16,13 @@
 use Brainbits\Transcoder\Exception\DecodeFailedException;
 
 /**
- * Deflate decoder
- *
- * @author Gregor Welters <gwelters@brainbits.net>
+ * Deflate decoder.
  */
 class DeflateDecoder implements DecoderInterface
 {
     const TYPE = 'deflate';
 
-    /**
-     * @inheritDoc
-     */
-    public function decode($data)
+    public function decode(string $data): string
     {
         $data = gzinflate($data);
 
@@ -36,10 +33,7 @@ public function decode($data)
         return $data;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function supports($type)
+    public function supports(?string $type): bool
     {
         return self::TYPE === $type;
     }

src/Decoder/GzipDecoder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder package.
  *
@@ -14,18 +16,13 @@
 use Brainbits\Transcoder\Exception\DecodeFailedException;
 
 /**
- * Gzip decoder
- *
- * @author Gregor Welters <gwelters@brainbits.net>
+ * Gzip decoder.
  */
 class GzipDecoder implements DecoderInterface
 {
     const TYPE = 'gzip';
 
-    /**
-     * @inheritDoc
-     */
-    public function decode($data)
+    public function decode(string $data): string
     {
         $data = gzdecode($data);
 
@@ -36,10 +33,7 @@ public function decode($data)
         return $data;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function supports($type)
+    public function supports(?string $type): bool
     {
         return self::TYPE === $type;
     }