Piou-piou / RibsAdminBundle

Service/Version.php

Indentation +175 added lines, -175 removed lines

@@ -15,179 +15,179 @@
 
 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
-     */
-    private function getToken()
-    {
-        $token = null;
-        $response = $this->client->request("GET", $this->package->getProjectUrl()."ribs-admin/packages/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
-     */
-    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 $package_guid
-     * @throws Exception
-     */
-    public function save($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
+				 */
+				private function getToken()
+				{
+								$token = null;
+								$response = $this->client->request("GET", $this->package->getProjectUrl()."ribs-admin/packages/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
+				 */
+				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 $package_guid
+				 * @throws Exception
+				 */
+				public function save($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 +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
     private function getToken()
     {
         $token = null;
-        $response = $this->client->request("GET", $this->package->getProjectUrl()."ribs-admin/packages/send-token/");
+        $response = $this->client->request("GET", $this->package->getProjectUrl() . "ribs-admin/packages/send-token/");
         $datas = $response->getStatusCode() == 200 ? $response->getContent() : null;
 
         if ($datas) {
@@ -104,7 +104,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');

Service/PackagistApi.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             return false;
         }
 
-        $packgist_url = "https://repo.packagist.org/p/".$this->package_name.".json";
+        $packgist_url = "https://repo.packagist.org/p/" . $this->package_name . ".json";
         $response = $this->client->request("GET", $packgist_url);
 
         if ($response->getStatusCode() == 200) {

Indentation +77 added lines, -77 removed lines

@@ -11,92 +11,92 @@
 
 class PackagistApi
 {
-    /**
-     * @var HttpClientInterface
-     */
-    private $client;
+				/**
+				 * @var HttpClientInterface
+				 */
+				private $client;
 
-    /**
-     * @var string
-     */
-    private $package_name = null;
+				/**
+				 * @var string
+				 */
+				private $package_name = null;
 
-    /**
-     * @var array
-     */
-    private $package_info = [];
+				/**
+				 * @var array
+				 */
+				private $package_info = [];
 
-    /**
-     * PackagistApi constructor.
-     * @param HttpClientInterface $client
-     */
-    public function __construct(HttpClientInterface $client)
-    {
-        $this->client = $client;
-    }
+				/**
+				 * PackagistApi constructor.
+				 * @param HttpClientInterface $client
+				 */
+				public function __construct(HttpClientInterface $client)
+				{
+								$this->client = $client;
+				}
 
-    /**
-     * @return false|mixed
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    private function getPackageInformation()
-    {
-        if ($this->package_info) {
-            return $this->package_info;
-        }
+				/**
+				 * @return false|mixed
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				private function getPackageInformation()
+				{
+								if ($this->package_info) {
+												return $this->package_info;
+								}
 
-        if (!$this->package_name || !strpos($this->package_name, "/")) {
-            return false;
-        }
+								if (!$this->package_name || !strpos($this->package_name, "/")) {
+												return false;
+								}
 
-        $packgist_url = "https://repo.packagist.org/p/".$this->package_name.".json";
-        $response = $this->client->request("GET", $packgist_url);
+								$packgist_url = "https://repo.packagist.org/p/".$this->package_name.".json";
+								$response = $this->client->request("GET", $packgist_url);
 
-        if ($response->getStatusCode() == 200) {
-            $content = json_decode($response->getContent(), true);
-            if (is_array($content) && $content["packages"] && $content["packages"][$this->package_name]) {
-                $this->package_info = $content["packages"][$this->package_name];
-                return $this->package_info;
-            }
-        }
+								if ($response->getStatusCode() == 200) {
+												$content = json_decode($response->getContent(), true);
+												if (is_array($content) && $content["packages"] && $content["packages"][$this->package_name]) {
+																$this->package_info = $content["packages"][$this->package_name];
+																return $this->package_info;
+												}
+								}
 
-        return false;
-    }
+								return false;
+				}
 
-    /**
-     * @param string $package_name
-     * @return false|int|string|null
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function getLastPackagistVersion(string $package_name)
-    {
-        $this->package_name = $package_name;
-        if ($package = $this->getPackageInformation()) {
-            return array_key_first($package);
-        }
+				/**
+				 * @param string $package_name
+				 * @return false|int|string|null
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function getLastPackagistVersion(string $package_name)
+				{
+								$this->package_name = $package_name;
+								if ($package = $this->getPackageInformation()) {
+												return array_key_first($package);
+								}
 
-        return false;
-    }
+								return false;
+				}
 
-    /**
-     * @param string $package_name
-     * @return array
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function getAllPackagistVersions(string $package_name)
-    {
-        $this->package_name = $package_name;
-        if ($package = $this->getPackageInformation()) {
-            return array_keys($package);
-        }
-    }
+				/**
+				 * @param string $package_name
+				 * @return array
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function getAllPackagistVersions(string $package_name)
+				{
+								$this->package_name = $package_name;
+								if ($package = $this->getPackageInformation()) {
+												return array_keys($package);
+								}
+				}
 }