Piou-piou / RibsAdminBundle

Command/ImportModuleCommand.php

Indentation +51 added lines, -51 removed lines

@@ -13,64 +13,64 @@
 
 class ImportModuleCommand extends Command
 {
-    private $em;
+				private $em;
 
-    /**
-     * ImportModuleCommand constructor.
-     * @param EntityManagerInterface $em
-     * @param string|null $name
-     */
-    public function __construct(EntityManagerInterface $em, string $name = null)
-    {
-        parent::__construct($name);
-        $this->em = $em;
-    }
+				/**
+				 * ImportModuleCommand constructor.
+				 * @param EntityManagerInterface $em
+				 * @param string|null $name
+				 */
+				public function __construct(EntityManagerInterface $em, string $name = null)
+				{
+								parent::__construct($name);
+								$this->em = $em;
+				}
 
-    protected function configure()
-    {
-        $this
-            ->setName('ribsadmin:import-module')
-            ->setDescription('Import a module in ribs admin')
-            ->addArgument(
-                'package-name',
-                InputArgument::REQUIRED,
-                'Name of composer package to import'
-            )
-            ->addArgument(
-                'module-name',
-                InputArgument::REQUIRED,
-                'Name of package to display in app'
-            )
-        ;
-    }
+				protected function configure()
+				{
+								$this
+												->setName('ribsadmin:import-module')
+												->setDescription('Import a module in ribs admin')
+												->addArgument(
+																'package-name',
+																InputArgument::REQUIRED,
+																'Name of composer package to import'
+												)
+												->addArgument(
+																'module-name',
+																InputArgument::REQUIRED,
+																'Name of package to display in app'
+												)
+								;
+				}
 
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $package_name = $input->getArgument('package-name');
-        $output->writeln("Start composer require " . $package_name);
+				protected function execute(InputInterface $input, OutputInterface $output)
+				{
+								$package_name = $input->getArgument('package-name');
+								$output->writeln("Start composer require " . $package_name);
 
-        $process = Process::fromShellCommandline("composer require " . $package_name);
-        $process->run(function ($type, $buffer) {
-            echo $buffer;
-        });
+								$process = Process::fromShellCommandline("composer require " . $package_name);
+								$process->run(function ($type, $buffer) {
+												echo $buffer;
+								});
 
-        if (!$process->isSuccessful()) {
-            throw new ProcessFailedException($process);
-        }
+								if (!$process->isSuccessful()) {
+												throw new ProcessFailedException($process);
+								}
 
-        $output->writeln("End composer require " . $package_name);
-        $output->writeln("Start insertion of module in database " . $package_name);
+								$output->writeln("End composer require " . $package_name);
+								$output->writeln("Start insertion of module in database " . $package_name);
 
-        $module = new Module();
-        $module->setPackageName($package_name);
-        $module->setTitle($input->getArgument('module-name'));
-        $module->setActive(false);
-        $module->setDisplayed(true);
-        $this->em->persist($module);
-        $this->em->flush();
+								$module = new Module();
+								$module->setPackageName($package_name);
+								$module->setTitle($input->getArgument('module-name'));
+								$module->setActive(false);
+								$module->setDisplayed(true);
+								$this->em->persist($module);
+								$this->em->flush();
 
-        $output->writeln("Installation of " . $package_name . " is finished. You have now to configure this module in your administration interface");
+								$output->writeln("Installation of " . $package_name . " is finished. You have now to configure this module in your administration interface");
 
-        return 0;
-    }
+								return 0;
+				}
 }

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         $output->writeln("Start composer require " . $package_name);
 
         $process = Process::fromShellCommandline("composer require " . $package_name);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 

Command/ChangePackageVersionCommand.php

Indentation +48 added lines, -48 removed lines

@@ -12,52 +12,52 @@
 
 class ChangePackageVersionCommand extends Command
 {
-    protected function configure()
-    {
-        $this
-            ->setName('ribsadmin:change-package-version')
-            ->setDescription('Change a package version')
-            ->addArgument(
-                'package-name',
-                InputArgument::REQUIRED,
-                'Name of composer package to import with version (example : piou/piou/test-bundle:1.0.0)'
-            )
-        ;
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $fs = new Filesystem();
-        $cd = "";
-
-        if (!$fs->exists("composer.json") && $fs->exists("index.php")) {
-            $cd = "cd .. && ";
-        }
-
-        $package_name = $input->getArgument('package-name');
-        $output->writeln("Start composer require " . $package_name);
-
-        $process = Process::fromShellCommandline($cd . "chmod 777 composer.json");
-        $process->run(function ($type, $buffer) {
-            echo $buffer;
-        });
-
-        $process = Process::fromShellCommandline($cd . "composer require " . $package_name);
-        $process->run(function ($type, $buffer) {
-            echo $buffer;
-        });
-
-        if (!$process->isSuccessful()) {
-            throw new ProcessFailedException($process);
-        }
-
-        $process = Process::fromShellCommandline($cd . "chmod 644 composer.json");
-        $process->run(function ($type, $buffer) {
-            echo $buffer;
-        });
-
-        $output->writeln("Change version of " . $package_name . " is finished.");
-
-        return 0;
-    }
+				protected function configure()
+				{
+								$this
+												->setName('ribsadmin:change-package-version')
+												->setDescription('Change a package version')
+												->addArgument(
+																'package-name',
+																InputArgument::REQUIRED,
+																'Name of composer package to import with version (example : piou/piou/test-bundle:1.0.0)'
+												)
+								;
+				}
+
+				protected function execute(InputInterface $input, OutputInterface $output)
+				{
+								$fs = new Filesystem();
+								$cd = "";
+
+								if (!$fs->exists("composer.json") && $fs->exists("index.php")) {
+												$cd = "cd .. && ";
+								}
+
+								$package_name = $input->getArgument('package-name');
+								$output->writeln("Start composer require " . $package_name);
+
+								$process = Process::fromShellCommandline($cd . "chmod 777 composer.json");
+								$process->run(function ($type, $buffer) {
+												echo $buffer;
+								});
+
+								$process = Process::fromShellCommandline($cd . "composer require " . $package_name);
+								$process->run(function ($type, $buffer) {
+												echo $buffer;
+								});
+
+								if (!$process->isSuccessful()) {
+												throw new ProcessFailedException($process);
+								}
+
+								$process = Process::fromShellCommandline($cd . "chmod 644 composer.json");
+								$process->run(function ($type, $buffer) {
+												echo $buffer;
+								});
+
+								$output->writeln("Change version of " . $package_name . " is finished.");
+
+								return 0;
+				}
 }

Spacing +3 added lines, -3 removed lines

@@ -38,12 +38,12 @@ 
         $output->writeln("Start composer require " . $package_name);
 
         $process = Process::fromShellCommandline($cd . "chmod 777 composer.json");
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 
         $process = Process::fromShellCommandline($cd . "composer require " . $package_name);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 
@@ -52,7 +52,7 @@ 
         }
 
         $process = Process::fromShellCommandline($cd . "chmod 644 composer.json");
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 

Service/Version.php

Indentation +215 added lines, -215 removed lines

@@ -15,219 +15,219 @@
 
 class Version
 {
-    /**
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     * @var HttpClientInterface
-     */
-    private $client;
-
-    /**
-     * @var ParameterBagInterface
-     */
-    private $parameter;
-
-    /**
-     * @var PackagistApi
-     */
-    private $packagist;
-
-    /**
-     * @var mixed
-     */
-    private $local_token;
-
-    /**
-     * @var Package
-     */
-    private $package;
-
-    private $messages = [];
-
-    /**
-     * Version constructor.
-     * @param EntityManagerInterface $em
-     * @param HttpClientInterface $client
-     * @param ParameterBagInterface $parameter
-     * @param PackagistApi $packagist
-     */
-    public function __construct(EntityManagerInterface $em, HttpClientInterface $client, ParameterBagInterface $parameter, PackagistApi $packagist)
-    {
-        $this->em = $em;
-        $this->client = $client;
-        $this->parameter = $parameter;
-        $this->packagist = $packagist;
-        $this->local_token = $parameter->get("ribs_admin.packages_token");
-    }
-
-    /**
-     * @return array
-     */
-    public function getMessages(): array
-    {
-        return $this->messages;
-    }
-
-    /**
-     * @param Package $package
-     */
-    public function setPackageEntity(Package $package)
-    {
-        $this->package = $package;
-    }
-
-    /**
-     * @return mixed|null
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    private function getToken()
-    {
-        $token = null;
-        $response = $this->client->request("GET", $this->package->getProjectUrl()."ribs-admin/packages/dist/send-token/");
-        $datas = $response->getStatusCode() == 200 ? $response->getContent() : null;
-
-        if ($datas) {
-            $token = json_decode($datas, true)["token"];
-        }
-
-        return $token;
-    }
-
-    /**
-     * @return mixed|null
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    private function getComposerLockJson()
-    {
-        if ($this->package && !$this->package->isIsLocal()) {
-            $response = $this->client->request("GET", $this->package->getProjectUrl().$this->package->getComposerLockUrl());
-            $composer_lock = $response->getStatusCode() == 200 ? $response->getContent() : null;
-        } else {
-            $composer_lock = file_get_contents('../composer.lock');
-        }
-
-        if ($composer_lock) {
-            return json_decode($composer_lock, true);
-        }
-
-        return null;
-    }
-
-    /**
-     * @return mixed|null
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function getPackage()
-    {
-        $composer_lock = $this->getComposerLockJson();
-        if ($composer_lock) {
-            $packages = $composer_lock["packages"];
-            $key = array_search($this->package->getPackageName(), array_column($packages, 'name'));
-
-            if ($key) {
-                return $packages[$key];
-            }
-        }
-
-        $this->messages["composer_lock"] = "Composer lock not found at " . $this->package->getProjectUrl();
-
-        return null;
-    }
-
-    /**
-     * @return mixed|null
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function getVersion()
-    {
-        return $this->getPackage($this->package->getPackageName()) ? $this->getPackage($this->package->getPackageName())["version"] : null;
-    }
-
-    /**
-     * @return DateTime|null
-     * @throws Exception
-     */
-    public function getVersionDate(): ?DateTime
-    {
-        $string_date = $this->getPackage($this->package->getPackageName()) ? explode("T", $this->getPackage($this->package->getPackageName())["time"])[0] : null;
-        $version_date = null;
-
-        if ($string_date) {
-            $version_date = new DateTime($string_date);
-        }
-
-        return $version_date;
-    }
-
-    /**
-     * @param string $guid
-     * @param string $version
-     * @return string|void|null
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function updatePackage(string $guid, string $version)
-    {
-        $package = $this->em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
-
-        if ($package) {
-            $this->setPackageEntity($package);
-
-            if (!$this->getToken() || $this->getToken() !== $this->local_token) {
-                $this->messages["token_error"] = "Token not matching on : " . $this->package->getProjectUrl();
-                return;
-            }
-
-            $response = $this->client->request("GET", $this->package->getProjectUrl().'ribs-admin/packages/dist/change-version/'.$package->getPackageName().':'.$version);
-            $this->save($guid);
-
-            return $response->getStatusCode() == 200 ? $response->getContent() : null;
-        }
-    }
-
-    /**
-     * @param string $package_guid
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function save(string $package_guid)
-    {
-        $package = $this->em->getRepository(Package::class)->findOneBy(["guid" => $package_guid]);
-
-        if ($package) {
-            $this->setPackageEntity($package);
-
-            if (!$this->getToken() || $this->getToken() !== $this->local_token) {
-                $this->messages["token_error"] = "Token not matching on : " . $this->package->getProjectUrl();
-                return;
-            }
-
-            $package->setVersion($this->getVersion());
-            $package->setVersionDate($this->getVersionDate());
-            $package->setLastPackagistVersion($this->packagist->getLastPackagistVersion($package->getPackageName()));
-            $package->setLastCheck(new DateTime());
-
-            $this->em->persist($package);
-            $this->em->flush();
-        }
-    }
+				/**
+				 * @var EntityManagerInterface
+				 */
+				private $em;
+
+				/**
+				 * @var HttpClientInterface
+				 */
+				private $client;
+
+				/**
+				 * @var ParameterBagInterface
+				 */
+				private $parameter;
+
+				/**
+				 * @var PackagistApi
+				 */
+				private $packagist;
+
+				/**
+				 * @var mixed
+				 */
+				private $local_token;
+
+				/**
+				 * @var Package
+				 */
+				private $package;
+
+				private $messages = [];
+
+				/**
+				 * Version constructor.
+				 * @param EntityManagerInterface $em
+				 * @param HttpClientInterface $client
+				 * @param ParameterBagInterface $parameter
+				 * @param PackagistApi $packagist
+				 */
+				public function __construct(EntityManagerInterface $em, HttpClientInterface $client, ParameterBagInterface $parameter, PackagistApi $packagist)
+				{
+								$this->em = $em;
+								$this->client = $client;
+								$this->parameter = $parameter;
+								$this->packagist = $packagist;
+								$this->local_token = $parameter->get("ribs_admin.packages_token");
+				}
+
+				/**
+				 * @return array
+				 */
+				public function getMessages(): array
+				{
+								return $this->messages;
+				}
+
+				/**
+				 * @param Package $package
+				 */
+				public function setPackageEntity(Package $package)
+				{
+								$this->package = $package;
+				}
+
+				/**
+				 * @return mixed|null
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				private function getToken()
+				{
+								$token = null;
+								$response = $this->client->request("GET", $this->package->getProjectUrl()."ribs-admin/packages/dist/send-token/");
+								$datas = $response->getStatusCode() == 200 ? $response->getContent() : null;
+
+								if ($datas) {
+												$token = json_decode($datas, true)["token"];
+								}
+
+								return $token;
+				}
+
+				/**
+				 * @return mixed|null
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				private function getComposerLockJson()
+				{
+								if ($this->package && !$this->package->isIsLocal()) {
+												$response = $this->client->request("GET", $this->package->getProjectUrl().$this->package->getComposerLockUrl());
+												$composer_lock = $response->getStatusCode() == 200 ? $response->getContent() : null;
+								} else {
+												$composer_lock = file_get_contents('../composer.lock');
+								}
+
+								if ($composer_lock) {
+												return json_decode($composer_lock, true);
+								}
+
+								return null;
+				}
+
+				/**
+				 * @return mixed|null
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function getPackage()
+				{
+								$composer_lock = $this->getComposerLockJson();
+								if ($composer_lock) {
+												$packages = $composer_lock["packages"];
+												$key = array_search($this->package->getPackageName(), array_column($packages, 'name'));
+
+												if ($key) {
+																return $packages[$key];
+												}
+								}
+
+								$this->messages["composer_lock"] = "Composer lock not found at " . $this->package->getProjectUrl();
+
+								return null;
+				}
+
+				/**
+				 * @return mixed|null
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function getVersion()
+				{
+								return $this->getPackage($this->package->getPackageName()) ? $this->getPackage($this->package->getPackageName())["version"] : null;
+				}
+
+				/**
+				 * @return DateTime|null
+				 * @throws Exception
+				 */
+				public function getVersionDate(): ?DateTime
+				{
+								$string_date = $this->getPackage($this->package->getPackageName()) ? explode("T", $this->getPackage($this->package->getPackageName())["time"])[0] : null;
+								$version_date = null;
+
+								if ($string_date) {
+												$version_date = new DateTime($string_date);
+								}
+
+								return $version_date;
+				}
+
+				/**
+				 * @param string $guid
+				 * @param string $version
+				 * @return string|void|null
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function updatePackage(string $guid, string $version)
+				{
+								$package = $this->em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
+
+								if ($package) {
+												$this->setPackageEntity($package);
+
+												if (!$this->getToken() || $this->getToken() !== $this->local_token) {
+																$this->messages["token_error"] = "Token not matching on : " . $this->package->getProjectUrl();
+																return;
+												}
+
+												$response = $this->client->request("GET", $this->package->getProjectUrl().'ribs-admin/packages/dist/change-version/'.$package->getPackageName().':'.$version);
+												$this->save($guid);
+
+												return $response->getStatusCode() == 200 ? $response->getContent() : null;
+								}
+				}
+
+				/**
+				 * @param string $package_guid
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function save(string $package_guid)
+				{
+								$package = $this->em->getRepository(Package::class)->findOneBy(["guid" => $package_guid]);
+
+								if ($package) {
+												$this->setPackageEntity($package);
+
+												if (!$this->getToken() || $this->getToken() !== $this->local_token) {
+																$this->messages["token_error"] = "Token not matching on : " . $this->package->getProjectUrl();
+																return;
+												}
+
+												$package->setVersion($this->getVersion());
+												$package->setVersionDate($this->getVersionDate());
+												$package->setLastPackagistVersion($this->packagist->getLastPackagistVersion($package->getPackageName()));
+												$package->setLastCheck(new DateTime());
+
+												$this->em->persist($package);
+												$this->em->flush();
+								}
+				}
 }

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
     private function getToken()
     {
         $token = null;
-        $response = $this->client->request("GET", $this->package->getProjectUrl()."ribs-admin/packages/dist/send-token/");
+        $response = $this->client->request("GET", $this->package->getProjectUrl() . "ribs-admin/packages/dist/send-token/");
         $datas = $response->getStatusCode() == 200 ? $response->getContent() : null;
 
         if ($datas) {
@@ -109,7 +109,7 @@ 
     private function getComposerLockJson()
     {
         if ($this->package && !$this->package->isIsLocal()) {
-            $response = $this->client->request("GET", $this->package->getProjectUrl().$this->package->getComposerLockUrl());
+            $response = $this->client->request("GET", $this->package->getProjectUrl() . $this->package->getComposerLockUrl());
             $composer_lock = $response->getStatusCode() == 200 ? $response->getContent() : null;
         } else {
             $composer_lock = file_get_contents('../composer.lock');
@@ -195,7 +195,7 @@ 
                 return;
             }
 
-            $response = $this->client->request("GET", $this->package->getProjectUrl().'ribs-admin/packages/dist/change-version/'.$package->getPackageName().':'.$version);
+            $response = $this->client->request("GET", $this->package->getProjectUrl() . 'ribs-admin/packages/dist/change-version/' . $package->getPackageName() . ':' . $version);
             $this->save($guid);
 
             return $response->getStatusCode() == 200 ? $response->getContent() : null;