Apply fixes from StyleCI

Author: J-T-McC

config/atomic-deployments.php

@@ -28,7 +28,7 @@
     'build-limit' => 10,
 
     /**
-     * Logic used when creating a deployment directory
+     * Logic used when creating a deployment directory.
      *
      * Default => git - uses hash for current HEAD
      * Options: [ git, rand ]
@@ -51,7 +51,7 @@
      * @see https://www.php.net/manual/en/function.glob.php
      */
     'migrate' => [
-    //        'storage/framework/sessions/*',
+        //        'storage/framework/sessions/*',
     ],
 
 ];

src/Helpers/FileHelper.php

@@ -5,7 +5,6 @@
 use Illuminate\Support\Facades\File;
 use JTMcC\AtomicDeployments\Exceptions\ExecuteFailedException;
 use JTMcC\AtomicDeployments\Exceptions\InvalidPathException;
-
 use JTMcC\AtomicDeployments\Services\Exec;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -31,21 +30,22 @@ public static function confirmPathsExist(string ...$paths): bool
     }
 
     /**
-     * Recursively update symbolic links with new endpoint
+     * Recursively update symbolic links with new endpoint.
      *
      * @param $from
      * @param $to
      *
      * @throws ExecuteFailedException
      */
-    public static function recursivelyUpdateSymlinks($from, $to) {
+    public static function recursivelyUpdateSymlinks($from, $to)
+    {
         $dir = new RecursiveDirectoryIterator($to);
-        foreach(new RecursiveIteratorIterator($dir) as $file) {
-            if(is_link($file)) {
+        foreach (new RecursiveIteratorIterator($dir) as $file) {
+            if (is_link($file)) {
                 $link = $file->getPathName();
                 $target = $file->getLinkTarget();
                 $newPath = str_replace($from, $to, $target);
-                if($target !== $newPath) {
+                if ($target !== $newPath) {
                     Exec::ln($link, $newPath);
                 }
             }

src/Services/AtomicDeploymentService.php

@@ -242,12 +242,13 @@ public function copyMigrationContents(): void
     /**
      * @throws ExecuteFailedException
      */
-    public function updateSymlinks() {
-
+    public function updateSymlinks()
+    {
         Output::info('Correcting old symlinks that still reference the build directory');
 
-        if($this->isDryRun()) {
+        if ($this->isDryRun()) {
             Output::warn('Dry run - skipping symlink corrections');
+
             return;
         }
 

src/Services/Deployment.php

@@ -4,9 +4,8 @@
 
 namespace JTMcC\AtomicDeployments\Services;
 
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\File;
-
+use Illuminate\Support\Str;
 use JTMcC\AtomicDeployments\Exceptions\ExecuteFailedException;
 use JTMcC\AtomicDeployments\Exceptions\InvalidPathException;
 use JTMcC\AtomicDeployments\Helpers\FileHelper;
@@ -71,13 +70,11 @@ public function setDeploymentDirectory(string $name = ''): void
         $this->setDeploymentPath();
     }
 
-
     public function getDeploymentDirectory(): string
     {
         return $this->deploymentDirectory;
     }
 
-
     /**
      * Get the current symlinked deployment path.
      *
@@ -96,13 +93,15 @@ public function getCurrentDeploymentPath(): string
     }
 
     /**
-     * @return string
      * @throws ExecuteFailedException
+     *
+     * @return string
      */
-    public function getDirectoryName() {
-        switch($this->directoryNaming) {
+    public function getDirectoryName()
+    {
+        switch ($this->directoryNaming) {
             case 'rand':
-                return Str::random(5) . time();
+                return Str::random(5).time();
             case 'git':
             default:
                 return Exec::getGitHash();

src/Services/Exec.php

@@ -81,5 +81,4 @@ public static function getGitHash()
     {
         return self::run('git log --pretty="%h" -n1');
     }
-
 }

tests/Integration/Services/AtomicDeploymentServiceTest.php

@@ -96,7 +96,8 @@ public function it_doesnt_allow_deployments_folder_to_be_subdirectory_of_build_f
     /**
      * @test
      */
-    public function it_rolls_back_symbolic_link_to_deployment_detected_on_boot() {
+    public function it_rolls_back_symbolic_link_to_deployment_detected_on_boot()
+    {
         $atomicDeployment1 = self::getAtomicDeployment();
         $atomicDeployment1->createDeploymentDirectory();
         $atomicDeployment1->linkDeployment();
@@ -117,10 +118,11 @@ public function it_rolls_back_symbolic_link_to_deployment_detected_on_boot() {
     /**
      * @test
      */
-    public function it_calls_closure_on_success() {
+    public function it_calls_closure_on_success()
+    {
         $this->expectsEvents(DeploymentSuccessful::class);
         $success = false;
-        self::getAtomicDeployment()->deploy(function () use(&$success) {
+        self::getAtomicDeployment()->deploy(function () use (&$success) {
             $success = true;
         });
         $this->assertTrue($success);
@@ -129,14 +131,15 @@ public function it_calls_closure_on_success() {
     /**
      * @test
      */
-    public function it_calls_closure_on_failure() {
+    public function it_calls_closure_on_failure()
+    {
         $this->app['config']->set('atomic-deployments.build-path', $this->buildPath);
         $this->app['config']->set('atomic-deployments.deployments-path', $this->buildPath.'/deployments');
         $this->expectsEvents(DeploymentFailed::class);
         $this->expectException(InvalidPathException::class);
         $failed = false;
         $atomicDeployment = self::getAtomicDeployment();
-        $atomicDeployment->deploy(fn() => '', function () use(&$failed) {
+        $atomicDeployment->deploy(fn () => '', function () use (&$failed) {
             $failed = true;
         });
         $this->assertTrue($failed);

tests/Integration/Services/DeploymentTest.php

@@ -26,16 +26,18 @@ public function it_links_and_confirms_deployment()
     /**
      * @test
      */
-    public function it_sets_deployment_directory() {
+    public function it_sets_deployment_directory()
+    {
         $atomicDeployment = self::getDeployment();
         $atomicDeployment->setDeploymentDirectory('abc123');
-        $this->assertTrue( $atomicDeployment->getDeploymentDirectory() === 'abc123');
+        $this->assertTrue($atomicDeployment->getDeploymentDirectory() === 'abc123');
     }
 
     /**
      * @test
      */
-    public function it_names_deployment_folder_using_config_directory_naming_git() {
+    public function it_names_deployment_folder_using_config_directory_naming_git()
+    {
         $gitHash = Exec::getGitHash();
         $atomicDeployment = self::getDeployment();
         $atomicDeployment->createDirectory();
@@ -45,7 +47,8 @@ public function it_names_deployment_folder_using_config_directory_naming_git() {
     /**
      * @test
      */
-    public function it_names_deployment_folder_using_config_directory_naming_rand() {
+    public function it_names_deployment_folder_using_config_directory_naming_rand()
+    {
         $this->app['config']->set('atomic-deployments.directory-naming', 'rand');
         $gitHash = Exec::getGitHash();
         $atomicDeployment = self::getDeployment();
@@ -57,7 +60,8 @@ public function it_names_deployment_folder_using_config_directory_naming_rand()
     /**
      * @test
      */
-    public function it_sets_deployment_path() {
+    public function it_sets_deployment_path()
+    {
         $atomicDeployment = self::getDeployment();
         $atomicDeployment->setDeploymentPath();
         $this->assertNotEmpty(trim($atomicDeployment->getDeploymentPath()));
@@ -66,7 +70,8 @@ public function it_sets_deployment_path() {
     /**
      * @test
      */
-    public function it_creates_a_directory() {
+    public function it_creates_a_directory()
+    {
         $atomicDeployment = self::getDeployment();
         $atomicDeployment->createDirectory();
         $this->assertTrue($this->fileSystem->exists($atomicDeployment->getDeploymentPath()));
@@ -75,10 +80,10 @@ public function it_creates_a_directory() {
     /**
      * @test
      */
-    public function it_updates_model_status() {
+    public function it_updates_model_status()
+    {
         $atomicDeployment = self::getDeployment();
         $atomicDeployment->updateDeploymentStatus(DeploymentStatus::SUCCESS);
-        $this->assertTrue((int)AtomicDeployment::first()->deployment_status === DeploymentStatus::SUCCESS);
+        $this->assertTrue((int) AtomicDeployment::first()->deployment_status === DeploymentStatus::SUCCESS);
     }
-
 }

tests/TestCase.php

@@ -126,7 +126,8 @@ public static function getAtomicDeployment($hash = '')
     /**
      * @return Deployment
      */
-    public static function getDeployment() {
+    public static function getDeployment()
+    {
         return app(Deployment::class);
     }
 }

tests/Unit/Helpers/FileHelperTest.php

@@ -25,13 +25,13 @@ public function it_updates_symbolic_links_to_new_path()
     {
 
         //create test build & deployment scenario
-        $oldSite = self::tmpFolder . 'build/site';
-        $oldContent = $oldSite . '/content';
-        $oldLink = $oldSite . '/link';
+        $oldSite = self::tmpFolder.'build/site';
+        $oldContent = $oldSite.'/content';
+        $oldLink = $oldSite.'/link';
 
-        $newSite = self::tmpFolder . 'deployments/site';
-        $newContent = $newSite . '/content';
-        $newLink = $newSite . '/link';
+        $newSite = self::tmpFolder.'deployments/site';
+        $newContent = $newSite.'/content';
+        $newLink = $newSite.'/link';
 
         $this->fileSystem->ensureDirectoryExists($oldContent);
         $this->fileSystem->ensureDirectoryExists($newSite);
@@ -41,12 +41,11 @@ public function it_updates_symbolic_links_to_new_path()
         $this->assertTrue(Exec::readlink($oldLink) === $oldContent);
 
         //copy old content to deployment folder and confirm link still points to build folder
-        Exec::rsync($oldSite . '/', $newSite . '/');
+        Exec::rsync($oldSite.'/', $newSite.'/');
         $this->assertTrue(Exec::readlink($newLink) === $oldContent);
 
         //convert links to new deployment path and confirm
         FileHelper::recursivelyUpdateSymlinks($oldSite, $newSite);
         $this->assertTrue(Exec::readlink($newLink) === $newContent);
-
     }
 }