Piou-piou / RibsAdminBundle

Service/Version.php

Indentation +193 added lines, -193 removed lines

@@ -15,197 +15,197 @@
 
 class Version
 {
-    /**
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     * @var HttpClientInterface
-     */
-    private $client;
-
-    /**
-     * @var ParameterBagInterface
-     */
-    private $parameter;
-
-    /**
-     * @var mixed
-     */
-    private $local_token;
-
-    /**
-     * @var Package
-     */
-    private $package;
-
-    private $messages = [];
-
-    /**
-     * Version constructor.
-     * @param EntityManagerInterface $em
-     * @param HttpClientInterface $client
-     * @param ParameterBagInterface $parameter
-     */
-    public function __construct(EntityManagerInterface $em, HttpClientInterface $client, ParameterBagInterface $parameter)
-    {
-        $this->em = $em;
-        $this->client = $client;
-        $this->parameter = $parameter;
-        $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;
-    }
-
-    /**
-     * @return false|int|string|null
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function getLastPackagistVersion()
-    {
-        if (!strpos($this->package->getPackageName(), "/")) {
-            return false;
-        }
-
-        $packgist_url = "https://repo.packagist.org/p/".$this->package->getPackageName().".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->getPackageName()]) {
-                return array_key_first($content["packages"][$this->package->getPackageName()]);
-            }
-        }
-    }
-
-    /**
-     * @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->getLastPackagistVersion());
-            $package->setLastCheck(new DateTime());
-
-            $this->em->persist($package);
-            $this->em->flush();
-        }
-    }
+				/**
+				 * @var EntityManagerInterface
+				 */
+				private $em;
+
+				/**
+				 * @var HttpClientInterface
+				 */
+				private $client;
+
+				/**
+				 * @var ParameterBagInterface
+				 */
+				private $parameter;
+
+				/**
+				 * @var mixed
+				 */
+				private $local_token;
+
+				/**
+				 * @var Package
+				 */
+				private $package;
+
+				private $messages = [];
+
+				/**
+				 * Version constructor.
+				 * @param EntityManagerInterface $em
+				 * @param HttpClientInterface $client
+				 * @param ParameterBagInterface $parameter
+				 */
+				public function __construct(EntityManagerInterface $em, HttpClientInterface $client, ParameterBagInterface $parameter)
+				{
+								$this->em = $em;
+								$this->client = $client;
+								$this->parameter = $parameter;
+								$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;
+				}
+
+				/**
+				 * @return false|int|string|null
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function getLastPackagistVersion()
+				{
+								if (!strpos($this->package->getPackageName(), "/")) {
+												return false;
+								}
+
+								$packgist_url = "https://repo.packagist.org/p/".$this->package->getPackageName().".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->getPackageName()]) {
+																return array_key_first($content["packages"][$this->package->getPackageName()]);
+												}
+								}
+				}
+
+				/**
+				 * @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->getLastPackagistVersion());
+												$package->setLastCheck(new DateTime());
+
+												$this->em->persist($package);
+												$this->em->flush();
+								}
+				}
 }

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,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) {
@@ -97,7 +97,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');
@@ -171,7 +171,7 @@ 
             return false;
         }
 
-        $packgist_url = "https://repo.packagist.org/p/".$this->package->getPackageName().".json";
+        $packgist_url = "https://repo.packagist.org/p/" . $this->package->getPackageName() . ".json";
 
         $response = $this->client->request("GET", $packgist_url);
 

Controller/PackageController.php

Indentation +151 added lines, -151 removed lines

@@ -16,156 +16,156 @@
 
 class PackageController extends AbstractController
 {
-    /**
-     * @Route("/packages/", name="ribsadmin_packages")
-     * @param EntityManagerInterface $em
-     * @return Response
-     */
-    public function index(EntityManagerInterface $em): Response
-    {
-        $packages = $em->getRepository(Package::class)->findAll();
+				/**
+				 * @Route("/packages/", name="ribsadmin_packages")
+				 * @param EntityManagerInterface $em
+				 * @return Response
+				 */
+				public function index(EntityManagerInterface $em): Response
+				{
+								$packages = $em->getRepository(Package::class)->findAll();
         
-        return $this->render("@RibsAdmin/packages/list.html.twig", ["packages" => $packages]);
-    }
-
-    /**
-     * @Route("/packages/create/", name="ribsadmin_packages_create")
-     * @Route("/packages/show/{guid}", name="ribsadmin_packages_show")
-     * @Route("/packages/edit/{guid}", name="ribsadmin_packages_edit")
-     * @param Request $request
-     * @param EntityManagerInterface $em
-     * @param string|null $guid
-     * @return Response
-     */
-    public function edit(Request $request, EntityManagerInterface $em, string $guid = null): Response
-    {
-        $disabled_form = strpos($request->get("_route"), "_show") ? true : false;
-        if (!$guid) {
-            $package = new Package();
-            $text = "created";
-        } else {
-            $package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
-            $text = "edited";
-        }
-
-        $form = $this->createForm(\PiouPiou\RibsAdminBundle\Form\Package::class, $package, ["disabled" => $disabled_form]);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            /** @var Package $data */
-            $data = $form->getData();
-            $em->persist($data);
-            $em->flush();
-            $this->addFlash("success-flash", "Package " . $data->getProjectName() . " was " . $text);
-
-            return $this->redirectToRoute("ribsadmin_packages");
-        }
-
-        return $this->render("@RibsAdmin/packages/edit.html.twig", [
-            "form" => $form->createView(),
-            "form_errors" => $form->getErrors(),
-            "package" => $package
-        ]);
-    }
-
-    /**
-     * @Route("/packages/delete/{guid}", name="ribsadmin_packages_delete")
-     * @param EntityManagerInterface $em
-     * @param string $guid
-     * @return RedirectResponse
-     */
-    public function delete(EntityManagerInterface $em, string $guid): RedirectResponse
-    {
-        $package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
-
-        if ($package) {
-            $em->remove($package);
-            $em->flush();
-            $this->addFlash("success-flash", "The project package was deleted");
-        } else {
-            $this->addFlash("error-flash", "The project package was not found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_packages");
-    }
-
-    /**
-     * @Route("/packages/update/{guid}", name="ribsadmin_packages_update")
-     * @param Version $version
-     * @param string $guid
-     * @return RedirectResponse
-     * @throws Exception
-     */
-    public function updatePackage(Version $version, string $guid): RedirectResponse
-    {
-        if ($guid) {
-            $version->save($guid);
-
-            if ($version->getMessages()) {
-                $message = "<ul>";
-                $message .= "<li>The project package was not well updated</li>";
-                foreach ($version->getMessages() as $version_message) {
-                    $message .= "<li>".$version_message."</li>";
-                }
-                $message .= "</ul>";
-
-                $this->addFlash("info-flash", $message);
-            }
-
-            $this->addFlash("success-flash", "The project package was updated");
-        } else {
-            $this->addFlash("error-flash", "The project package was not found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_packages");
-    }
-
-    /**
-     * @Route("/packages/send-package/{package_name}", name="ribsadmin_packages_send", requirements={"package_name"=".+"})
-     * @param EntityManagerInterface $em
-     * @param Version $version
-     * @param string $package_name
-     * @return mixed|null
-     * @throws Exception
-     */
-    public function sendPackageInformations(EntityManagerInterface $em, Version $version, string $package_name): JsonResponse
-    {
-        $package = $em->getRepository(Package::class)->findOneBy(["package_name" => $package_name]);
-
-        if ($package) {
-            $version->setPackageEntity($package);
-        }
-
-        return new JsonResponse([
-            "package" => $version->getPackage(),
-            "package_date" => $version->getVersionDate()
-        ]);
-    }
-
-    /**
-     * @Route("/packages/send-composer-lock/", name="ribsadmin_packages_send_composer_lock")
-     * @return JsonResponse
-     */
-    public function sendComposerJson(): JsonResponse
-    {
-        $composer_lock = file_get_contents('../composer.lock');
-
-        if ($composer_lock) {
-            $composer_lock = json_decode($composer_lock);
-        }
-
-        return new JsonResponse($composer_lock);
-    }
-
-    /**
-     * @Route("/packages/send-token/", name="ribsadmin_packages_send_token")
-     * @param ParameterBagInterface $parameter
-     * @return JsonResponse
-     */
-    public function sendToken(ParameterBagInterface $parameter): JsonResponse
-    {
-        return new JsonResponse([
-            "token" => $parameter->get("ribs_admin.packages_token")
-        ]);
-    }
+								return $this->render("@RibsAdmin/packages/list.html.twig", ["packages" => $packages]);
+				}
+
+				/**
+				 * @Route("/packages/create/", name="ribsadmin_packages_create")
+				 * @Route("/packages/show/{guid}", name="ribsadmin_packages_show")
+				 * @Route("/packages/edit/{guid}", name="ribsadmin_packages_edit")
+				 * @param Request $request
+				 * @param EntityManagerInterface $em
+				 * @param string|null $guid
+				 * @return Response
+				 */
+				public function edit(Request $request, EntityManagerInterface $em, string $guid = null): Response
+				{
+								$disabled_form = strpos($request->get("_route"), "_show") ? true : false;
+								if (!$guid) {
+												$package = new Package();
+												$text = "created";
+								} else {
+												$package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
+												$text = "edited";
+								}
+
+								$form = $this->createForm(\PiouPiou\RibsAdminBundle\Form\Package::class, $package, ["disabled" => $disabled_form]);
+								$form->handleRequest($request);
+
+								if ($form->isSubmitted() && $form->isValid()) {
+												/** @var Package $data */
+												$data = $form->getData();
+												$em->persist($data);
+												$em->flush();
+												$this->addFlash("success-flash", "Package " . $data->getProjectName() . " was " . $text);
+
+												return $this->redirectToRoute("ribsadmin_packages");
+								}
+
+								return $this->render("@RibsAdmin/packages/edit.html.twig", [
+												"form" => $form->createView(),
+												"form_errors" => $form->getErrors(),
+												"package" => $package
+								]);
+				}
+
+				/**
+				 * @Route("/packages/delete/{guid}", name="ribsadmin_packages_delete")
+				 * @param EntityManagerInterface $em
+				 * @param string $guid
+				 * @return RedirectResponse
+				 */
+				public function delete(EntityManagerInterface $em, string $guid): RedirectResponse
+				{
+								$package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
+
+								if ($package) {
+												$em->remove($package);
+												$em->flush();
+												$this->addFlash("success-flash", "The project package was deleted");
+								} else {
+												$this->addFlash("error-flash", "The project package was not found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_packages");
+				}
+
+				/**
+				 * @Route("/packages/update/{guid}", name="ribsadmin_packages_update")
+				 * @param Version $version
+				 * @param string $guid
+				 * @return RedirectResponse
+				 * @throws Exception
+				 */
+				public function updatePackage(Version $version, string $guid): RedirectResponse
+				{
+								if ($guid) {
+												$version->save($guid);
+
+												if ($version->getMessages()) {
+																$message = "<ul>";
+																$message .= "<li>The project package was not well updated</li>";
+																foreach ($version->getMessages() as $version_message) {
+																				$message .= "<li>".$version_message."</li>";
+																}
+																$message .= "</ul>";
+
+																$this->addFlash("info-flash", $message);
+												}
+
+												$this->addFlash("success-flash", "The project package was updated");
+								} else {
+												$this->addFlash("error-flash", "The project package was not found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_packages");
+				}
+
+				/**
+				 * @Route("/packages/send-package/{package_name}", name="ribsadmin_packages_send", requirements={"package_name"=".+"})
+				 * @param EntityManagerInterface $em
+				 * @param Version $version
+				 * @param string $package_name
+				 * @return mixed|null
+				 * @throws Exception
+				 */
+				public function sendPackageInformations(EntityManagerInterface $em, Version $version, string $package_name): JsonResponse
+				{
+								$package = $em->getRepository(Package::class)->findOneBy(["package_name" => $package_name]);
+
+								if ($package) {
+												$version->setPackageEntity($package);
+								}
+
+								return new JsonResponse([
+												"package" => $version->getPackage(),
+												"package_date" => $version->getVersionDate()
+								]);
+				}
+
+				/**
+				 * @Route("/packages/send-composer-lock/", name="ribsadmin_packages_send_composer_lock")
+				 * @return JsonResponse
+				 */
+				public function sendComposerJson(): JsonResponse
+				{
+								$composer_lock = file_get_contents('../composer.lock');
+
+								if ($composer_lock) {
+												$composer_lock = json_decode($composer_lock);
+								}
+
+								return new JsonResponse($composer_lock);
+				}
+
+				/**
+				 * @Route("/packages/send-token/", name="ribsadmin_packages_send_token")
+				 * @param ParameterBagInterface $parameter
+				 * @return JsonResponse
+				 */
+				public function sendToken(ParameterBagInterface $parameter): JsonResponse
+				{
+								return new JsonResponse([
+												"token" => $parameter->get("ribs_admin.packages_token")
+								]);
+				}
 }