Merge pull request #3 from temp/remove-assert

dudlsack · dudlsack · commit 084b138bef62 · 2015-12-21T13:38:54.000+01:00
Remove assert
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -0,0 +1,6 @@
+inherit: true
+imports:
+  - php
+tools:
+    external_code_coverage:
+        timeout: 600    # Timeout in seconds.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: php
+
+php:
+  - 5.5
+  - 5.6
+  - 7
+  - hhvm
+
+before_script: composer install 
+
+script: vendor/bin/phpunit -c 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;'
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 brainbits GmbH (http://www.brainbits.net)
+Copyright (c) 2012-2016 brainbits GmbH (http://www.brainbits.net)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
diff --git a/composer.json b/composer.json
@@ -12,15 +12,28 @@
         {
             "name": "Phillip Look",
             "email": "plook@brainbits.net"
+        },
+        {
+            "name": "Stephan Wentz",
+            "email": "swentz@brainbits.net"
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "brainbits/transcoder": ">=1.1.0",
-        "symfony/framework-bundle": ">=2.1.0"
+        "php": ">=5.5.0",
+        "brainbits/transcoder": "~2.0"
+    },
+    "require-dev": {
+        "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"
     },
     "autoload": {
-        "psr-0": { "Brainbits": "src/" }
+        "psr-4": { "Brainbits\\TranscoderBundle\\": "src/" }
     },
-    "minimum-stability": "stable"
+    "autoload-dev": {
+        "psr-4": { "Brainbits\\TranscoderBundle\\Tests\\": "tests/" }
+    }
 }
diff --git a/src/BrainbitsTranscoderBundle.php b/src/BrainbitsTranscoderBundle.php
@@ -1,8 +1,8 @@
 <?php
-/**
- * This file is part of the brainbits transcoderbundle package.
+/*
+ * This file is part of the brainbits transcoder bundle package.
  *
- * (c) 2012-2013 brainbits GmbH (http://www.brainbits.net)
+ * (c) brainbits GmbH
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/DependencyInjection/BrainbitsTranscoderExtension.php b/src/DependencyInjection/BrainbitsTranscoderExtension.php
@@ -1,8 +1,9 @@
 <?php
-/**
- * This file is part of the brainbits transcoderbundle package.
+
+/*
+ * This file is part of the brainbits transcoder bundle package.
  *
- * (c) 2012-2013 brainbits GmbH (http://www.brainbits.net)
+ * (c) brainbits GmbH
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/DependencyInjection/Compiler/AddDecoderPass.php b/src/DependencyInjection/Compiler/AddDecoderPass.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the brainbits transcoder bundle package.
+ *
+ * (c) brainbits GmbH
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Brainbits\TranscoderBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/src/DependencyInjection/Compiler/AddEncoderPass.php b/src/DependencyInjection/Compiler/AddEncoderPass.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the brainbits transcoder bundle package.
+ *
+ * (c) brainbits GmbH
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Brainbits\TranscoderBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -1,8 +1,9 @@
 <?php
-/**
- * This file is part of the brainbits transcoderbundle package.
+
+/*
+ * This file is part of the brainbits transcoder bundle package.
  *
- * (c) 2012-2013 brainbits GmbH (http://www.brainbits.net)
+ * (c) brainbits GmbH
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Resources/config/decoders.xml b/src/Resources/config/decoders.xml
diff --git a/src/Resources/config/encoders.xml b/src/Resources/config/encoders.xml
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
diff --git a/tests/BrainbitsTranscoderBundleTest.php b/tests/BrainbitsTranscoderBundleTest.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ * This file is part of the brainbits transcoder bundle package.
+ *
+ * (c) brainbits GmbH
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Brainbits\TranscoderBundle\Tests;
+
+use Brainbits\TranscoderBundle\BrainbitsTranscoderBundle;
+use Brainbits\TranscoderBundle\DependencyInjection\Compiler\AddDecoderPass;
+use Brainbits\TranscoderBundle\DependencyInjection\Compiler\AddEncoderPass;
+use Prophecy\Argument;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Transcoder bundle test
+ *
+ * @author Stephan Wentz <swentz@brainbits.net>
+ */
+class BrainbitsTranscoderBundleTest extends \PHPUnit_Framework_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();
+
+        $bundle->build($container->reveal());
+    }
+}
diff --git a/tests/DependencyInjection/BrainbitsTranscoderExtensionTest.php b/tests/DependencyInjection/BrainbitsTranscoderExtensionTest.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ * This file is part of the brainbits transcoder bundle package.
+ *
+ * (c) brainbits GmbH
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Brainbits\TranscoderBundle\Tests\DependencyInjection;
+
+use Brainbits\TranscoderBundle\DependencyInjection\BrainbitsTranscoderExtension;
+use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
+
+/**
+ * Extension test
+ *
+ * @author Stephan Wentz <swentz@brainbits.net>
+ */
+class BrainbitsTranscoderExtensionTest extends AbstractExtensionTestCase
+{
+    protected function getContainerExtensions()
+    {
+        return array(
+            new BrainbitsTranscoderExtension()
+        );
+    }
+
+    public function testContainerHasDefaultParameters()
+    {
+        $this->load();
+
+        $this->assertContainerBuilderHasParameter('brainbits.transcoder.decoder.7z.executable', '7z');
+        $this->assertContainerBuilderHasParameter('brainbits.transcoder.encoder.7z.executable', '7z');
+    }
+
+    public function testContainerHasProvidedParameters()
+    {
+        $this->load(array(
+            'encoder' => array('7z' => 'sevenZ'),
+            'decoder' => array('7z' => 'sevenZ'),
+        ));
+
+        $this->assertContainerBuilderHasParameter('brainbits.transcoder.decoder.7z.executable', 'sevenZ');
+        $this->assertContainerBuilderHasParameter('brainbits.transcoder.encoder.7z.executable', 'sevenZ');
+    }
+}
diff --git a/tests/DependencyInjection/Compiler/AddDecoderPassTest.php b/tests/DependencyInjection/Compiler/AddDecoderPassTest.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * This file is part of the brainbits transcoder bundle package.
+ *
+ * (c) brainbits GmbH
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Brainbits\TranscoderBundle\Tests\DependencyInjection\Compiler;
+
+use Brainbits\TranscoderBundle\DependencyInjection\Compiler\AddDecoderPass;
+use PHPUnit_Framework_TestCase as TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Add decoder pass test
+ *
+ * @author Stephan Wentz <swentz@brainbits.net>
+ */
+class AddDecoderPassTest extends TestCase
+{
+    public function testProcessWithoutDefinition()
+    {
+        $pass = new AddDecoderPass();
+
+        $definition = new Definition(null, array(null));
+
+        $container = $this->prophesize(ContainerBuilder::class);
+        $container->hasDefinition('brainbits.transcoder.decoder.resolver')->willReturn(false);
+        $container->findTaggedServiceIds('transcoder.decoder')->shouldNotBeCalled();
+        $container->getDefinition('brainbits.transcoder.decoder.resolver')->shouldNotBeCalled();
+
+        $pass->process($container->reveal());
+
+        $this->assertNull($definition->getArgument(0)[0]);
+    }
+
+    public function testProcess()
+    {
+        $pass = new AddDecoderPass();
+
+        $definition = new Definition(null, array(null));
+
+        $container = $this->prophesize(ContainerBuilder::class);
+        $container->hasDefinition('brainbits.transcoder.decoder.resolver')->willReturn(true);
+        $container->findTaggedServiceIds('transcoder.decoder')->willReturn(array('test_id' => 'arg'));
+        $container->getDefinition('brainbits.transcoder.decoder.resolver')->willReturn($definition);
+
+        $pass->process($container->reveal());
+
+        $this->assertInstanceOf(Reference::class, $definition->getArgument(0)[0]);
+    }
+}
diff --git a/tests/DependencyInjection/Compiler/AddEncoderPassTest.php b/tests/DependencyInjection/Compiler/AddEncoderPassTest.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * This file is part of the brainbits transcoder bundle package.
+ *
+ * (c) brainbits GmbH
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Brainbits\TranscoderBundle\Tests\DependencyInjection\Compiler;
+
+use Brainbits\TranscoderBundle\DependencyInjection\Compiler\AddEncoderPass;
+use PHPUnit_Framework_TestCase as TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Add encoder pass test
+ *
+ * @author Stephan Wentz <swentz@brainbits.net>
+ */
+class AddEncoderPassTest extends TestCase
+{
+    public function testProcessWithoutDefinition()
+    {
+        $pass = new AddEncoderPass();
+
+        $definition = new Definition(null, array(null));
+
+        $container = $this->prophesize(ContainerBuilder::class);
+        $container->hasDefinition('brainbits.transcoder.encoder.resolver')->willReturn(false);
+        $container->findTaggedServiceIds('transcoder.encoder')->shouldNotBeCalled();
+        $container->getDefinition('brainbits.transcoder.encoder.resolver')->shouldNotBeCalled();
+
+        $pass->process($container->reveal());
+
+        $this->assertNull($definition->getArgument(0)[0]);
+    }
+
+    public function testProcess()
+    {
+        $pass = new AddEncoderPass();
+
+        $definition = new Definition(null, array(null));
+
+        $container = $this->prophesize(ContainerBuilder::class);
+        $container->hasDefinition('brainbits.transcoder.encoder.resolver')->willReturn(true);
+        $container->findTaggedServiceIds('transcoder.encoder')->willReturn(array('test_id' => 'arg'));
+        $container->getDefinition('brainbits.transcoder.encoder.resolver')->willReturn($definition);
+
+        $pass->process($container->reveal());
+
+        $this->assertInstanceOf(Reference::class, $definition->getArgument(0)[0]);
+    }
+}
diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php`
`2`		`-/**`
`3`		`- * This file is part of the brainbits transcoderbundle package.`
	`2`	`+/*`
	`3`	`+ * This file is part of the brainbits transcoder bundle package.`
`4`	`4`	`*`
`5`		`- * (c) 2012-2013 brainbits GmbH (http://www.brainbits.net)`
	`5`	`+ * (c) brainbits GmbH`
`6`	`6`	`*`
`7`	`7`	`* For the full copyright and license information, please view the LICENSE`
`8`	`8`	`* file that was distributed with this source code.`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`<?php`
`2`		`-/**`
`3`		`- * This file is part of the brainbits transcoderbundle package.`
	`2`	`+`
	`3`	`+/*`
	`4`	`+ * This file is part of the brainbits transcoder bundle package.`
`4`	`5`	`*`
`5`		`- * (c) 2012-2013 brainbits GmbH (http://www.brainbits.net)`
	`6`	`+ * (c) brainbits GmbH`
`6`	`7`	`*`
`7`	`8`	`* For the full copyright and license information, please view the LICENSE`
`8`	`9`	`* file that was distributed with this source code.`