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

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

Author: temp

.travis.yml

@@ -1,14 +1,17 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
-  - 7
-  - hhvm
+  - 7.1
+  - nightly
+
+matrix:
+  allow_failures:
+    - php:
+        - nightly
 
 before_script: composer install 
 
-script: vendor/bin/phpunit -c tests --coverage-clover=coverage.clover
+script: vendor/bin/phpunit --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;'

composer.json

@@ -19,22 +19,28 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "brainbits/transcoder": "^2.0.2"
+        "php": "^7.1",
+        "brainbits/transcoder": "^3.0"
     },
     "require-dev": {
-        "php": ">=5.5.0",
-        "phpunit/phpunit": "~4.5",
-        "symfony/config": "^2.3",
-        "symfony/dependency-injection": "^2.3",
-        "symfony/http-kernel": "^2.3",
-        "matthiasnoback/symfony-config-test": "^1.4",
-        "matthiasnoback/symfony-dependency-injection-test": "^0.7.6"
+        "phpunit/phpunit": "^6.0",
+        "symfony/config": "^2.8|^3.0",
+        "symfony/dependency-injection": "^2.8|^3.0",
+        "symfony/http-kernel": "^2.8|^3.0",
+        "matthiasnoback/symfony-config-test": "^3.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^2.0"
     },
     "autoload": {
         "psr-4": { "Brainbits\\TranscoderBundle\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Brainbits\\TranscoderBundle\\Tests\\": "tests/" }
-    }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.0-dev"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

tests/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-bundle">
+        <directory>tests</directory>
     </testsuite>
     <filter>
         <whitelist>
-            <directory suffix=".php">../src/</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>

src/BrainbitsTranscoderBundle.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder bundle package.
  *
@@ -16,13 +19,11 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * brainbits transcoder bundle
- *
- * @author Phillip Look <[email protected]>
+ * brainbits transcoder bundle.
  */
 class BrainbitsTranscoderBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 

src/DependencyInjection/BrainbitsTranscoderExtension.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder bundle package.
  *
@@ -11,27 +13,19 @@
 
 namespace Brainbits\TranscoderBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * This is the class that loads and manages your bundle configuration
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
- *
- * @author Gregor Welters <[email protected]>
+ * This is the class that loads and manages your bundle configuration.
  */
 class BrainbitsTranscoderExtension extends Extension
 {
-    /**
-     * {@inheritDoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
         $loader->load('decoders.xml');
         $loader->load('encoders.xml');

src/DependencyInjection/Compiler/AddDecoderPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder bundle package.
  *
@@ -11,13 +13,16 @@
 
 namespace Brainbits\TranscoderBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * Add decoder pass.
+ */
 class AddDecoderPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (false === $container->hasDefinition('brainbits.transcoder.decoder.resolver')) {
             return;

src/DependencyInjection/Compiler/AddEncoderPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder bundle package.
  *
@@ -15,9 +17,12 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * Add decoder pass.
+ */
 class AddEncoderPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (false === $container->hasDefinition('brainbits.transcoder.encoder.resolver')) {
             return;

src/DependencyInjection/Configuration.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /*
  * This file is part of the brainbits transcoder bundle package.
  *
@@ -15,13 +17,11 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * BrainbitsTranscoderExtension configuration structure.
- *
- * @author Stephan Wentz <[email protected]>
+ * brainbits transcoder configuration.
  */
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('brainbits_transcoder');

tests/BrainbitsTranscoderBundleTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the brainbits transcoder bundle package.
  *
@@ -13,23 +14,24 @@
 use Brainbits\TranscoderBundle\BrainbitsTranscoderBundle;
 use Brainbits\TranscoderBundle\DependencyInjection\Compiler\AddDecoderPass;
 use Brainbits\TranscoderBundle\DependencyInjection\Compiler\AddEncoderPass;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Transcoder bundle test
- *
- * @author Stephan Wentz <[email protected]>
+ * Transcoder bundle test.
  */
-class BrainbitsTranscoderBundleTest extends \PHPUnit_Framework_TestCase
+class BrainbitsTranscoderBundleTest extends TestCase
 {
     public function testBuild()
     {
         $bundle = new BrainbitsTranscoderBundle();
 
         $container = $this->prophesize(ContainerBuilder::class);
-        $container->addCompilerPass(Argument::type(AddDecoderPass::class))->shouldBeCalled();
-        $container->addCompilerPass(Argument::type(AddEncoderPass::class))->shouldBeCalled();
+        $container->addCompilerPass(Argument::type(AddDecoderPass::class))
+            ->shouldBeCalled();
+        $container->addCompilerPass(Argument::type(AddEncoderPass::class))
+            ->shouldBeCalled();
 
         $bundle->build($container->reveal());
     }

tests/DependencyInjection/BrainbitsTranscoderExtensionTest.php

@@ -14,17 +14,15 @@
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 
 /**
- * Extension test
- *
- * @author Stephan Wentz <[email protected]>
+ * Extension test.
  */
 class BrainbitsTranscoderExtensionTest extends AbstractExtensionTestCase
 {
     protected function getContainerExtensions()
     {
-        return array(
+        return [
             new BrainbitsTranscoderExtension()
-        );
+        ];
     }
 
     public function testContainerHasDefaultParameters()
@@ -37,10 +35,10 @@ public function testContainerHasDefaultParameters()
 
     public function testContainerHasProvidedParameters()
     {
-        $this->load(array(
-            'encoder' => array('7z' => 'sevenZ'),
-            'decoder' => array('7z' => 'sevenZ'),
-        ));
+        $this->load([
+            'encoder' => ['7z' => 'sevenZ'],
+            'decoder' => ['7z' => 'sevenZ'],
+        ]);
 
         $this->assertContainerBuilderHasParameter('brainbits.transcoder.decoder.7z.executable', 'sevenZ');
         $this->assertContainerBuilderHasParameter('brainbits.transcoder.encoder.7z.executable', 'sevenZ');