Make it work with Symfony 4

.gitignore

@@ -1,5 +1,4 @@
 composer.lock
-code-coverage
 build
 vendor
 phpunit.xml

.travis.yml

@@ -1,49 +1 @@
-sudo: false
-
-language: php
-
-cache:
-    directories:
-        - $HOME/.composer/cache/files
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 7.0
-  - hhvm
-
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.3
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
-    # Test against Symfony LTS versions
-    - php: 5.6
-      env: SYMFONY_VERSION="2.3.*"
-    - php: 5.6
-      env: SYMFONY_VERSION="2.7.*"
-    - php: 5.6
-      env: SYMFONY_VERSION="2.8.*" DEPENDENCIES=dev
-    # Test against dev versions
-    - php: 5.6
-      env: DEPENDENCIES=dev
-  allow_failures:
-    - env: DEPENDENCIES=dev
-
-before_install:
-    - composer self-update
-    - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
-    - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony:"$SYMFONY_VERSION"; fi
-
-install:
-    - composer update $COMPOSER_FLAGS
-
-before_script:
-    - mkdir -p build/logs
-
-script:
-    - composer phpunit
-
-after_script:
-    - composer coveralls
+# TODO: HANDLE CI WITH TRAVIS

Command/IncrementCommand.php

@@ -2,18 +2,36 @@
 
 namespace Kachkaev\AssetsVersionBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-
+use Kachkaev\AssetsVersionBundle\AssetsVersionManager;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class IncrementCommand extends ContainerAwareCommand
+class IncrementCommand extends Command
 {
-    protected function configure()
+    private AssetsVersionManager $assetsVersionManager;
+    private string $parameterName;
+    private string $filePath;
+
+    /**
+     * IncrementCommand constructor.
+     *
+     * @param AssetsVersionManager $assetsVersionManager
+     * @param string               $parameterName
+     * @param string               $filePath
+     */
+    public function __construct(AssetsVersionManager $assetsVersionManager, string $parameterName, string $filePath)
+    {
+        parent::__construct();
+        $this->assetsVersionManager = $assetsVersionManager;
+        $this->parameterName = $parameterName;
+        $this->filePath = $filePath;
+    }
+
+    protected function configure(): void
     {
         $this
-            ->setName('assets-version:increment')
             ->setDescription('Increments assets version parameter')
             ->addArgument(
                     'delta',
@@ -24,13 +42,15 @@ protected function configure()
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
-        $output->writeln('Incrementing parameter <info>'.$this->getContainer()->getParameter('kachkaev_assets_version.parameter_name').'</info> in <info>'.basename($this->getContainer()->getParameter('kachkaev_assets_version.file_path')).'</info> by <info>'.var_export($input->getArgument('delta'), true).'</info>...');
+        $output->writeln('Incrementing parameter <info>'.$this->parameterName.'</info> in <info>'.basename($this->filePath).'</info> by <info>'.var_export($input->getArgument('delta'), true).'</info>...');
 
-        $assetsVersionUpdater = $this->getContainer()->get('kachkaev_assets_version.assets_version_manager');
+        $assetsVersionUpdater = $this->assetsVersionManager;
         $assetsVersionUpdater->incrementVersion($input->getArgument('delta'));
 
-        $output->writeln('Done. New value for <info>'.$this->getContainer()->getParameter('kachkaev_assets_version.parameter_name').'</info> is <info>'.$assetsVersionUpdater->getVersion().'</info>. Clearing of <info>prod</info> cache is required.');
+        $output->writeln('Done. New value for <info>'.$this->parameterName.'</info> is <info>'.$assetsVersionUpdater->getVersion().'</info>. Clearing of <info>prod</info> cache is required.');
+
+        return self::SUCCESS;
     }
 }

Command/SetCommand.php

@@ -2,18 +2,36 @@
 
 namespace Kachkaev\AssetsVersionBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-
+use Kachkaev\AssetsVersionBundle\AssetsVersionManager;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class SetCommand extends ContainerAwareCommand
+class SetCommand extends Command
 {
-    protected function configure()
+    private AssetsVersionManager $assetsVersionManager;
+    private string $parameterName;
+    private string $filePath;
+
+    /**
+     * SetCommand constructor.
+     *
+     * @param AssetsVersionManager $assetsVersionManager
+     * @param string               $parameterName
+     * @param string               $filePath
+     */
+    public function __construct(AssetsVersionManager $assetsVersionManager, string $parameterName, string $filePath)
+    {
+        parent::__construct();
+        $this->assetsVersionManager = $assetsVersionManager;
+        $this->parameterName = $parameterName;
+        $this->filePath = $filePath;
+    }
+
+    protected function configure(): void
     {
         $this
-            ->setName('assets-version:set')
             ->setDescription('Sets assets version parameter to a given value')
             ->addArgument(
                     'value',
@@ -23,14 +41,16 @@ protected function configure()
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
 
-        $output->writeln('Setting parameter <info>'.$this->getContainer()->getParameter('kachkaev_assets_version.parameter_name').'</info> in <info>'.basename($this->getContainer()->getParameter('kachkaev_assets_version.file_path')).'</info> to <info>'.var_export($input->getArgument('value'), true).'</info>...');
+        $output->writeln('Setting parameter <info>'.$this->parameterName.'</info> in <info>'.basename($this->filePath).'</info> to <info>'.var_export($input->getArgument('value'), true).'</info>...');
 
-        $assetsVersionUpdater = $this->getContainer()->get('kachkaev_assets_version.assets_version_manager');
+        $assetsVersionUpdater = $this->assetsVersionManager;
         $assetsVersionUpdater->setVersion($input->getArgument('value'));
 
         $output->writeln('Done. Clearing of <info>prod</info> cache is required.');
+
+        return self::SUCCESS;
     }
 }

DependencyInjection/Configuration.php

@@ -9,15 +9,15 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritDoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('assets_version');
+        $treeBuilder = new TreeBuilder('assets_version');
 
-        $rootNode
+        $treeBuilder
+            ->getRootNode()
             ->children()
                 ->scalarNode('file_path')
-                    ->defaultValue('%kernel.root_dir%/config/parameters.yml')
+                    ->defaultValue('%kernel.project_dir%/app/config/parameters.yml')
                     ->info('path to the file that contains the assets version parameter')
                     ->end()
                 ->scalarNode('parameter_name')

DependencyInjection/KachkaevAssetsVersionExtension.php

@@ -12,13 +12,14 @@ class KachkaevAssetsVersionExtension extends Extension
     /**
      * {@inheritDoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('config.yml');
+        $loader->load('services.yml');
 
         if (null !== $config['file_path']) {
             $container->setParameter('kachkaev_assets_version.file_path', $config['file_path']);

Resources/config/services.yml

@@ -0,0 +1,15 @@
+services:
+  Kachkaev\AssetsVersionBundle\Command\IncrementCommand:
+    arguments:
+      - '@kachkaev_assets_version.assets_version_manager'
+      - '%kachkaev_assets_version.parameter_name%'
+      - '%kachkaev_assets_version.file_path%'
+    tags:
+      - { name: 'console.command', command: 'assets-version:increment' }
+  Kachkaev\AssetsVersionBundle\Command\SetCommand:
+    arguments:
+      - '@kachkaev_assets_version.assets_version_manager'
+      - '%kachkaev_assets_version.parameter_name%'
+      - '%kachkaev_assets_version.file_path%'
+    tags:
+      - { name: 'console.command', command: 'assets-version:set' }