Updated codestyle and PHPUnit (#43)

composer.json

@@ -1,8 +1,10 @@
 {
-    "name":        "hostnet/asset-bundle",
-    "type":        "symfony-bundle",
-    "description": "Allows the configuration of the hostnet/asset-lib package in your Symfony application.",
-    "license":     "MIT",
+    "name":              "hostnet/asset-bundle",
+    "type":              "symfony-bundle",
+    "description":       "Allows the configuration of the hostnet/asset-lib package in your Symfony application.",
+    "license":           "MIT",
+    "minimum-stability": "dev",
+    "prefer-stable":     true,
     "authors": [
         {
             "name":  "Yannick de Lange",
@@ -25,8 +27,8 @@
         "twig/twig":          "^1.38.2||^2.7.2"
     },
     "conflict": {
-        "twig/twig": "<1.26",
-        "phpdocumentor/type-resolver" : "<0.3"
+        "phpdocumentor/type-resolver": "<0.3",
+        "twig/twig":                   "<1.26"
     },
     "autoload": {
         "psr-4": {
@@ -38,8 +40,6 @@
             "Hostnet\\Bundle\\AssetBundle\\": "test/"
         }
     },
-    "minimum-stability" : "dev",
-    "prefer-stable"     : true,
     "archive": {
         "exclude": [
             "/test"

src/Command/CompileCommand.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 

src/Command/DebugCommand.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017-2018 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 
@@ -28,14 +28,14 @@ public function __construct(ConfigInterface $config, ImportFinderInterface $find
         $this->finder = $finder;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Displays asset information.')
             ->addArgument('file');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         if ($input->getArgument('file')) {
             $this->checkFile($output, $input->getArgument('file'));
@@ -44,7 +44,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
     }
 
-    private function checkFile(OutputInterface $output, string $file)
+    private function checkFile(OutputInterface $output, string $file): void
     {
         $entry_points = $this->config->getEntryPoints();
         $assets       = $this->config->getAssetFiles();
@@ -102,7 +102,7 @@ private function checkFile(OutputInterface $output, string $file)
         $this->printDependencyTree($output, $file_obj);
     }
 
-    private function printDependencyTree(OutputInterface $output, File $file, int $depth = 0)
+    private function printDependencyTree(OutputInterface $output, File $file, int $depth = 0): void
     {
         $deps = $this->finder->all($file);
 
@@ -114,16 +114,16 @@ private function printDependencyTree(OutputInterface $output, File $file, int $d
         }
     }
 
-    private function filesize(string $file)
+    private function filesize(string $file): string
     {
         $bytes  = filesize($this->config->getProjectRoot() . DIRECTORY_SEPARATOR . $file);
         $sizes  = 'BKMGTP';
-        $factor = (int) floor((strlen((string) $bytes) - 1) / 3);
+        $factor = (int) floor((\strlen((string) $bytes) - 1) / 3);
 
         return sprintf('%.2f', $bytes / (1024 ** $factor)) . @$sizes[$factor];
     }
 
-    private function printAll(OutputInterface $output)
+    private function printAll(OutputInterface $output): void
     {
         $entry_points = $this->config->getEntryPoints();
         $assets       = $this->config->getAssetFiles();

src/DependencyInjection/HostnetAssetExtension.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 
@@ -145,7 +145,7 @@ private function configurePlugin($class, ContainerBuilder $container): Reference
         return new Reference($class);
     }
 
-    private function configureCommands(ContainerBuilder $container)
+    private function configureCommands(ContainerBuilder $container): void
     {
         $compile = (new Definition(CompileCommand::class, [
             new Reference('hostnet_asset.config'),
@@ -171,7 +171,7 @@ private function configureCommands(ContainerBuilder $container)
         $container->setDefinition('hostnet_asset.command.debug', $debug);
     }
 
-    private function configureEventListeners(ContainerBuilder $container)
+    private function configureEventListeners(ContainerBuilder $container): void
     {
         if (! $container->getParameter('kernel.debug')) {
             return;
@@ -186,7 +186,7 @@ private function configureEventListeners(ContainerBuilder $container)
         $container->setDefinition('hostnet_asset.listener.assets_change', $change_listener);
     }
 
-    private function configureTwig(ContainerBuilder $container)
+    private function configureTwig(ContainerBuilder $container): void
     {
         $ext = (new Definition(AssetExtension::class, [
             new Reference('hostnet_asset.config'),

src/EventListener/AssetsChangeListener.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 
@@ -18,7 +18,7 @@ final class AssetsChangeListener
 
     public function __construct(BundlerInterface $bundler, BuildConfig $build_config)
     {
-        $this->bundler = $bundler;
+        $this->bundler      = $bundler;
         $this->build_config = $build_config;
     }
 

src/HostnetAssetBundle.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 

src/Twig/AssetExtension.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 

test/Command/CompileCommandTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 
@@ -32,7 +32,7 @@ class CompileCommandTest extends TestCase
      */
     private $compile_command;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->config       = $this->prophesize(ConfigInterface::class);
         $this->bundler      = $this->prophesize(BundlerInterface::class);
@@ -45,7 +45,7 @@ protected function setUp()
         );
     }
 
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->config->getProjectRoot()->willReturn(__DIR__);
         $this->config->replaceReporter(Argument::type(NullReporter::class))->willReturn(new NullReporter());
@@ -59,7 +59,7 @@ public function testExecute()
         $this->compile_command->run(new ArrayInput([]), $output->reveal());
     }
 
-    public function testExecuteVerbose()
+    public function testExecuteVerbose(): void
     {
         $this->config->getProjectRoot()->willReturn(__DIR__);
         $this->config->replaceReporter(Argument::type(ConsoleLoggingReporter::class))->willReturn(new NullReporter());
@@ -76,7 +76,7 @@ public function testExecuteVerbose()
         $this->compile_command->run(new ArrayInput([]), $output->reveal());
     }
 
-    public function testExecuteVeryVerbose()
+    public function testExecuteVeryVerbose(): void
     {
         $this->config->getProjectRoot()->willReturn(__DIR__);
         $this->config->replaceReporter(Argument::type(ConsoleReporter::class))->willReturn(new NullReporter());

test/Command/DebugCommandTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 
@@ -29,7 +29,7 @@ class DebugCommandTest extends TestCase
      */
     private $compile_command;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->config = $this->prophesize(ConfigInterface::class);
         $this->finder = $this->prophesize(ImportFinderInterface::class);
@@ -40,7 +40,7 @@ protected function setUp()
         );
     }
 
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->config->getProjectRoot()->willReturn(dirname(__DIR__));
         $this->config->getSourceRoot()->willReturn(basename(__DIR__));
@@ -54,7 +54,7 @@ public function testExecute()
         self::assertStringEqualsFile(__DIR__ . '/expected.output.txt', $output->fetch());
     }
 
-    public function testExecuteWithEntryPoint()
+    public function testExecuteWithEntryPoint(): void
     {
         $this->config->getProjectRoot()->willReturn(dirname(__DIR__));
         $this->config->getSourceRoot()->willReturn(basename(__DIR__));
@@ -82,7 +82,7 @@ public function testExecuteWithEntryPoint()
         ), $output->fetch());
     }
 
-    public function testExecuteWithAsset()
+    public function testExecuteWithAsset(): void
     {
         $this->config->getProjectRoot()->willReturn(dirname(__DIR__));
         $this->config->getSourceRoot()->willReturn(basename(__DIR__));

test/DependencyInjection/HostnetAssetExtensionTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);
 
@@ -33,12 +33,12 @@ class HostnetAssetExtensionTest extends TestCase
      */
     private $hostnet_asset_extension;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->hostnet_asset_extension = new HostnetAssetExtension();
     }
 
-    public function testBlankConfig()
+    public function testBlankConfig(): void
     {
         $container = new ContainerBuilder();
 
@@ -66,7 +66,7 @@ public function testBlankConfig()
         ], array_keys($container->getDefinitions()));
     }
 
-    public function testLoadDebug()
+    public function testLoadDebug(): void
     {
         $container = new ContainerBuilder();
 
@@ -100,7 +100,7 @@ public function testLoadDebug()
         $this->validateBaseServiceDefinitions($container);
     }
 
-    public function testLoadProd()
+    public function testLoadProd(): void
     {
         $container = new ContainerBuilder();
 
@@ -132,7 +132,7 @@ public function testLoadProd()
         $this->validateBaseServiceDefinitions($container);
     }
 
-    public function testLoadTypescript()
+    public function testLoadTypescript(): void
     {
         $container = new ContainerBuilder();
 
@@ -168,7 +168,7 @@ public function testLoadTypescript()
         $this->validateBaseServiceDefinitions($container);
     }
 
-    public function testLoadLess()
+    public function testLoadLess(): void
     {
         $container = new ContainerBuilder();
 
@@ -204,7 +204,7 @@ public function testLoadLess()
         $this->validateBaseServiceDefinitions($container);
     }
 
-    private function assertConfig(ContainerBuilder $container, bool $is_dev, string $output_folder, array $plugins = [])
+    private function assertConfig(ContainerBuilder $container, bool $is_dev, string $output_folder, array $plugins = []): void
     {
         $definition = $container->getDefinition('hostnet_asset.config');
 
@@ -221,7 +221,7 @@ private function assertConfig(ContainerBuilder $container, bool $is_dev, string
         self::assertEquals($plugin_references, $definition->getArgument(9));
     }
 
-    private function validateBaseServiceDefinitions(ContainerBuilder $container)
+    private function validateBaseServiceDefinitions(ContainerBuilder $container): void
     {
         self::assertEquals((new Definition(Executable::class, [
             '/usr/bin/node',
@@ -270,7 +270,7 @@ private function validateBaseServiceDefinitions(ContainerBuilder $container)
         $this->validateDebugServiceDefinitions($container);
     }
 
-    private function validateDebugServiceDefinitions(ContainerBuilder $container)
+    private function validateDebugServiceDefinitions(ContainerBuilder $container): void
     {
         self::assertEquals(
             (new Definition(AssetsChangeListener::class, [
@@ -286,7 +286,7 @@ private function validateDebugServiceDefinitions(ContainerBuilder $container)
         );
     }
 
-    public function testBuild()
+    public function testBuild(): void
     {
         $container = new ContainerBuilder();
 
@@ -315,7 +315,7 @@ public function testBuild()
      * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      * @expectedExceptionMessage Class stdClass should implement Hostnet\Component\Resolver\Plugin\PluginInterface.
      */
-    public function testBuildNonPlugin()
+    public function testBuildNonPlugin(): void
     {
         $container = new ContainerBuilder();
 
@@ -337,7 +337,7 @@ public function testBuildNonPlugin()
         $container->compile();
     }
 
-    public function testBuildNonBuiltin()
+    public function testBuildNonBuiltin(): void
     {
         $container = new ContainerBuilder();
 

test/DependencyInjection/MockPlugin.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright 2017 Hostnet B.V.
+ * @copyright 2017-present Hostnet B.V.
  */
 declare(strict_types=1);