Fixing unregistered commands (#534)

* Update oauth.xml

* fixing commands

* updating composer

* composer fixes

* fixing unregistered commands

* cleaning

Author: SebScoFr

Command/BaseCommand.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the FOSOAuthServerBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\OAuthServerBundle\Command;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Console\Command\Command;
+
+class BaseCommand extends Command implements ContainerAwareInterface
+{
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * @return ContainerInterface
+     */
+    public function getContainer()
+    {
+        return $this->container;
+    }
+}

Command/CleanCommand.php

@@ -11,19 +11,20 @@
 
 namespace FOS\OAuthServerBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use FOS\OAuthServerBundle\Model\TokenManagerInterface;
 use FOS\OAuthServerBundle\Model\AuthCodeManagerInterface;
 
-class CleanCommand extends ContainerAwareCommand
+class CleanCommand extends BaseCommand
 {
     /**
      * {@inheritdoc}
      */
     protected function configure()
     {
+        parent::configure();
+
         $this
             ->setName('fos:oauth-server:clean')
             ->setDescription('Clean expired tokens')
@@ -40,11 +41,11 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $services = array(
+        $services = [
             'fos_oauth_server.access_token_manager'  => 'Access token',
             'fos_oauth_server.refresh_token_manager' => 'Refresh token',
             'fos_oauth_server.auth_code_manager'     => 'Auth code',
-        );
+        ];
 
         foreach ($services as $service => $name) {
             /** @var $instance TokenManagerInterface */

Command/CreateClientCommand.php

@@ -15,15 +15,17 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use FOS\OAuthServerBundle\Model\ClientManagerInterface;
 
-class CreateClientCommand extends ContainerAwareCommand
+class CreateClientCommand extends BaseCommand
 {
     /**
      * {@inheritdoc}
      */
     protected function configure()
     {
+        parent::configure();
+
         $this
             ->setName('fos:oauth-server:create-client')
             ->setDescription('Creates a new client')
@@ -60,6 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io->title('Client Credentials');
 
         // Get the client manager
+        /** @var ClientManagerInterface $clientManager */
         $clientManager = $this->getContainer()->get('fos_oauth_server.client_manager.default');
 
         // Create a new client

Resources/config/oauth.xml

@@ -26,6 +26,15 @@
         <service id="FOS\OAuthServerBundle\Controller\TokenController">
             <argument type="service" id="fos_oauth_server.server" />
         </service>
+
         <service id="fos_oauth_server.controller.token" alias="FOS\OAuthServerBundle\Controller\TokenController" public="true" />
+
+        <service id="fos_oauth_server.clean_command" class="FOS\OAuthServerBundle\Command\CleanCommand">
+            <tag name="console.command" />
+        </service>
+
+        <service id="fos_oauth_server.create_client_command" class="FOS\OAuthServerBundle\Command\CreateClientCommand">
+            <tag name="console.command" />
+        </service>
     </services>
 </container>