diff --git a/Command/DriverLockCommand.php b/Command/DriverLockCommand.php index d1fed4d..d2608f3 100644 --- a/Command/DriverLockCommand.php +++ b/Command/DriverLockCommand.php @@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Symfony\Component\Console\Command\Command; /** * Create a lock action @@ -16,10 +16,20 @@ * @package LexikMaintenanceBundle * @author Gilles Gauthier */ -class DriverLockCommand extends ContainerAwareCommand +class DriverLockCommand extends Command { protected $ttl; + /** + * return object of Queue + * + * @return object + * @package LexikMaintenanceBundleBundle + */ + public function setContainer($container){ + $this->container = $container; + } + /** * {@inheritdoc} */ @@ -70,6 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } $output->writeln(''.$driver->getMessageLock($driver->lock()).''); + return 0; } /** @@ -137,7 +148,7 @@ function($value) use ($default) { */ private function getDriver() { - return $this->getContainer()->get('lexik_maintenance.driver.factory')->getDriver(); + return $this->container->get('lexik_maintenance.driver.factory')->getDriver(); } /** diff --git a/Command/DriverUnlockCommand.php b/Command/DriverUnlockCommand.php index 435e656..429fcde 100644 --- a/Command/DriverUnlockCommand.php +++ b/Command/DriverUnlockCommand.php @@ -4,7 +4,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Symfony\Component\Console\Command\Command; /** * Create an unlock action @@ -12,8 +12,19 @@ * @package LexikMaintenanceBundle * @author Gilles Gauthier */ -class DriverUnlockCommand extends ContainerAwareCommand +class DriverUnlockCommand extends Command { + + /** + * return object of Queue + * + * @return object + * @package LexikMaintenanceBundleBundle + */ + public function setContainer($container){ + $this->container = $container; + } + /** * {@inheritdoc} */ @@ -39,11 +50,12 @@ protected function execute(InputInterface $input, OutputInterface $output) return; } - $driver = $this->getContainer()->get('lexik_maintenance.driver.factory')->getDriver(); + $driver = $this->container->get('lexik_maintenance.driver.factory')->getDriver(); $unlockMessage = $driver->getMessageUnlock($driver->unlock()); $output->writeln(''.$unlockMessage.''); + return 0; } /** diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 6ee781f..aa60a6b 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -20,8 +20,8 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('lexik_maintenance'); + $treeBuilder = new TreeBuilder('lexik_maintenance'); + $rootNode = $treeBuilder->getRootNode(); $rootNode ->addDefaultsIfNotSet() diff --git a/Drivers/AbstractDriver.php b/Drivers/AbstractDriver.php index 17c5d0f..8be9ade 100644 --- a/Drivers/AbstractDriver.php +++ b/Drivers/AbstractDriver.php @@ -2,7 +2,7 @@ namespace Lexik\Bundle\MaintenanceBundle\Drivers; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Component\Translation\Translator; /** * Abstract class for drivers @@ -18,7 +18,7 @@ abstract class AbstractDriver protected $options; /** - * @var TranslatorInterface + * @var Translator */ protected $translator; @@ -122,9 +122,9 @@ public function getOptions() /** * Set translatorlator * - * @param TranslatorInterface $translator + * @param Translator $translator */ - public function setTranslator(TranslatorInterface $translator) + public function setTranslator(Translator $translator) { $this->translator = $translator; } diff --git a/Drivers/DriverFactory.php b/Drivers/DriverFactory.php index 3a71523..d8f4cec 100644 --- a/Drivers/DriverFactory.php +++ b/Drivers/DriverFactory.php @@ -39,7 +39,7 @@ class DriverFactory * @param array $driverOptions Options driver * @throws \ErrorException */ - public function __construct(DatabaseDriver $dbDriver, TranslatorInterface $translator, array $driverOptions) + public function __construct(DatabaseDriver $dbDriver, Translator $translator, array $driverOptions) { $this->driverOptions = $driverOptions; diff --git a/Listener/MaintenanceListener.php b/Listener/MaintenanceListener.php index c84a947..34686f3 100644 --- a/Listener/MaintenanceListener.php +++ b/Listener/MaintenanceListener.php @@ -6,8 +6,8 @@ use Lexik\Bundle\MaintenanceBundle\Exception\ServiceUnavailableException; use Symfony\Component\HttpKernel\HttpKernelInterface; -use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Symfony\Component\HttpKernel\Event\FilterResponseEvent; +use Symfony\Component\HttpKernel\Event\RequestEvent; +use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpFoundation\IpUtils; /** @@ -143,13 +143,13 @@ public function __construct( } /** - * @param GetResponseEvent $event GetResponseEvent + * @param RequestEvent $event RequestEvent * * @return void * * @throws ServiceUnavailableException */ - public function onKernelRequest(GetResponseEvent $event) + public function onKernelRequest(RequestEvent $event) { if(!$event->isMasterRequest()){ return; @@ -210,10 +210,10 @@ public function onKernelRequest(GetResponseEvent $event) /** * Rewrites the http code of the response * - * @param FilterResponseEvent $event FilterResponseEvent + * @param ResponseEvent $event ResponseEvent * @return void */ - public function onKernelResponse(FilterResponseEvent $event) + public function onKernelResponse(ResponseEvent $event) { if ($this->handleResponse && $this->http_code !== null) { $response = $event->getResponse(); diff --git a/Resources/config/services.xml b/Resources/config/services.xml index 4650cf0..290ab28 100644 --- a/Resources/config/services.xml +++ b/Resources/config/services.xml @@ -35,10 +35,16 @@ + + + + + + diff --git a/composer.json b/composer.json index da26c7b..b3f1064 100644 --- a/composer.json +++ b/composer.json @@ -21,12 +21,12 @@ ], "require": { "php": ">=5.3.9", - "symfony/framework-bundle": "~2.7|~3.0|^4.0", - "symfony/translation": "~2.7|~3.0|^4.0" + "symfony/framework-bundle": "~2.7|~3.0|^4.0|^5.0", + "symfony/translation": "~2.7|~3.0|^4.0|^5.0" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0|^4.0", - "phpunit/phpunit": "~4.8|~5.7.11" + "symfony/phpunit-bridge": "~2.7|~3.0|^4.0|^5.0", + "phpunit/phpunit": "8.5.*" }, "autoload": { "psr-4": { "Lexik\\Bundle\\MaintenanceBundle\\": "" }