Reformat code & cleanup

octobercms · Aug 13, 2023 · cd2ed50 · cd2ed50
1 parent 509364c
commit cd2ed50
Show file tree

Hide file tree

Showing 21 changed files with 201 additions and 190 deletions.
diff --git a/src/Translation/TranslationServiceProvider.php b/src/Translation/TranslationServiceProvider.php
@@ -1,11 +1,11 @@
 <?php namespace October\Rain\Translation;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Support\DeferrableProvider;
+use Illuminate\Support\ServiceProvider;
 
 /**
  * TranslationServiceProvider is a custom translator implemenation based on Laravel
-  *
+ *
  * @package october\translation
  * @author Alexey Bobkov, Samuel Georges
  */

diff --git a/src/Translation/Translator.php b/src/Translation/Translator.php
@@ -41,8 +41,7 @@ public function set($key, $value = null, $locale = null)
             foreach ($key as $innerKey => $innerValue) {
                 $this->set($innerKey, $innerValue, $locale);
             }
-        }
-        else {
+        } else {
             $locale = $locale ?: $this->locale;
 
             $this->loaded['*']['*'][$locale][$key] = $value;
@@ -59,7 +58,7 @@ protected function getValidationSpecific($key, $replace, $locale)
             !str_starts_with($key, 'validation.custom.') &&
             !str_starts_with($key, 'validation.attributes.')
         ) {
-            $nativeKey = 'system::'.$key;
+            $nativeKey = 'system::' . $key;
             $line = $this->get($nativeKey, $replace, $locale);
             if ($line !== $nativeKey) {
                 return $line;
@@ -72,9 +71,9 @@ protected function getValidationSpecific($key, $replace, $locale)
     /**
      * trans returns the translation for a given key
      *
-     * @param  array|string  $id
-     * @param  array   $parameters
-     * @param  string  $locale
+     * @param array|string $id
+     * @param array $parameters
+     * @param string $locale
      * @return string
      */
     public function trans($id, array $parameters = [], $locale = null)
@@ -85,10 +84,10 @@ public function trans($id, array $parameters = [], $locale = null)
     /**
      * transChoice gets a translation according to an integer value
      *
-     * @param  string  $id
-     * @param  int     $number
-     * @param  array   $parameters
-     * @param  string  $locale
+     * @param string $id
+     * @param int $number
+     * @param array $parameters
+     * @param string $locale
      * @return string
      */
     public function transChoice($id, $number, array $parameters = [], $locale = null)
@@ -99,7 +98,7 @@ public function transChoice($id, $number, array $parameters = [], $locale = null
     /**
      * localeArray gets the array of locales to be checked
      *
-     * @param  string|null  $locale
+     * @param string|null $locale
      * @return array
      */
     protected function localeArray($locale)

diff --git a/tests/Assetic/StylesheetMinifyTest.php b/tests/Assetic/StylesheetMinifyTest.php
@@ -8,7 +8,7 @@ class StylesheetMinifyTest extends TestCase
 {
     public function testSpaceRemoval()
     {
-        $input  = 'body{width: calc(99.9% * 1/1 - 0px); height: 0px;}';
+        $input = 'body{width: calc(99.9% * 1/1 - 0px); height: 0px;}';
         $output = 'body{width:calc(99.9% * 1/1 - 0px);height:0px}';
 
         $mockAsset = new MockAsset($input);
@@ -20,8 +20,8 @@ public function testSpaceRemoval()
 
     public function testEmptyClassPreserve()
     {
-        $input = ''.
-        '.view { /*
+        $input = '' .
+            '.view { /*
             * Text
             */
             /*
@@ -48,8 +48,8 @@ public function testEmptyClassPreserve()
 
     public function testEmptyCommentPreserve()
     {
-        $input = ''.
-        '
+        $input = '' .
+            '
         body { background: blue; }
         /**/
         .view { color: red; }';
@@ -65,7 +65,7 @@ public function testEmptyCommentPreserve()
 
     public function testSpecialCommentPreservation()
     {
-        $input  = 'body {/*! Keep me */}';
+        $input = 'body {/*! Keep me */}';
         $output = 'body{/*! Keep me */}';
 
         $mockAsset = new MockAsset($input);
@@ -77,7 +77,7 @@ public function testSpecialCommentPreservation()
 
     public function testCommentRemoval()
     {
-        $input  = 'body{/* First comment */} /* Second comment */';
+        $input = 'body{/* First comment */} /* Second comment */';
         $output = 'body{}';
 
         $mockAsset = new MockAsset($input);
@@ -89,7 +89,7 @@ public function testCommentRemoval()
 
     public function testCommentPreservationInVar()
     {
-        $input  = '--ring-inset: var(--empty, /*!*/ /*!*/);';
+        $input = '--ring-inset: var(--empty, /*!*/ /*!*/);';
         $output = '--ring-inset:var(--empty,/*!*/ /*!*/);';
 
         $mockAsset = new MockAsset($input);
@@ -101,7 +101,7 @@ public function testCommentPreservationInVar()
 
     public function testMinifyPreservationInVar()
     {
-        $input  = ''.
+        $input = '' .
             'select:focus {
                 --ring-inset: var(--empty, /*!*/ /*!*/);
                 --ring-offset-width: 0px;
@@ -119,7 +119,7 @@ public function testMinifyPreservationInVar()
 
     public function testUnitPreservationInVar()
     {
-        $input  = '--offset-width: 0px';
+        $input = '--offset-width: 0px';
         $output = '--offset-width:0px';
 
         $mockAsset = new MockAsset($input);
@@ -131,7 +131,7 @@ public function testUnitPreservationInVar()
 
     public function testAttributeSelectorsWithLess()
     {
-        $input = ''.
+        $input = '' .
             '[class^="icon-"]:before,
             [class*=" icon-"]:before {
                 speak: none;
@@ -152,7 +152,7 @@ public function testAttributeSelectorsWithLess()
 
     public function testSourceMappingUrlWithSpecialComment()
     {
-        $input = ''.
+        $input = '' .
             '/*! keep me */*,:after,:before { opacity: 1; }body {background: purple;}
 
             /*# sourceMappingUrl*/';

diff --git a/tests/Benchmark/Router/RouterBench.php b/tests/Benchmark/Router/RouterBench.php
@@ -65,16 +65,16 @@ public function init()
         // Build padded routes
         $routes = [];
         foreach ($this->fixtures as $index => $rule) {
-            $routes['pad1'.$index] = '/pad1/'.$rule;
-            $routes['pad2'.$index] = '/pad2/'.$rule;
-            $routes['pad3'.$index] = '/pad3/'.$rule;
-            $routes['pad3'.$index] = '/pad4/'.$rule;
-            $routes['pad3'.$index] = '/pad5/'.$rule;
+            $routes['pad1' . $index] = '/pad1/' . $rule;
+            $routes['pad2' . $index] = '/pad2/' . $rule;
+            $routes['pad3' . $index] = '/pad3/' . $rule;
+            $routes['pad3' . $index] = '/pad4/' . $rule;
+            $routes['pad3' . $index] = '/pad5/' . $rule;
         }
 
         // Final target at end (120 routes)
         foreach ($this->fixtures as $index => $rule) {
-            $routes['rule'.$index] = $rule;
+            $routes['rule' . $index] = $rule;
         }
 
         // Register with router
@@ -94,7 +94,7 @@ public function benchRoute()
         $router = new Router;
 
         foreach ($this->routes as $index => $rule) {
-            $router->route('rule'.$index, $rule);
+            $router->route('rule' . $index, $rule);
         }
 
         $router->match('authors/test/details');

diff --git a/tests/Database/SortableTest.php b/tests/Database/SortableTest.php
@@ -6,9 +6,9 @@ public function setUp(): void
     {
         $capsule = new Illuminate\Database\Capsule\Manager;
         $capsule->addConnection([
-            'driver'   => 'sqlite',
+            'driver' => 'sqlite',
             'database' => ':memory:',
-            'prefix'   => ''
+            'prefix' => ''
         ]);
         $capsule->setAsGlobal();
         $capsule->bootEloquent();

diff --git a/tests/Database/Traits/SluggableTest.php b/tests/Database/Traits/SluggableTest.php
@@ -29,8 +29,12 @@ public function setUp(): void
         });
 
         // Mock app instance for this test
-        App::swap(new class {
-            public function getLocale() { return 'en'; }
+        App::swap(new class
+        {
+            public function getLocale()
+            {
+                return 'en';
+            }
         });
     }
 

diff --git a/tests/Database/UpdaterTest.php b/tests/Database/UpdaterTest.php
@@ -6,7 +6,7 @@ class UpdaterTest extends TestCase
 {
     public function setUp(): void
     {
-        include_once __DIR__.'/../fixtures/database/SampleClass.php';
+        include_once __DIR__ . '/../fixtures/database/SampleClass.php';
 
         $this->updater = new Updater();
     }

diff --git a/tests/Events/EventDispatcherTest.php b/tests/Events/EventDispatcherTest.php
@@ -1,8 +1,8 @@
 <?php
 
 use October\Rain\Events\Dispatcher;
-use October\Rain\Events\PriorityDispatcher;
 use October\Rain\Events\FakeDispatcher;
+use October\Rain\Events\PriorityDispatcher;
 
 /**
  * EventDispatcherTest

diff --git a/tests/Extension/ExtendableTest.php b/tests/Extension/ExtendableTest.php
@@ -56,7 +56,7 @@ public function testDynamicPropertyOnClass()
 
     public function testDynamicallyImplementingClass()
     {
-        ExtendableTestExampleImplementableClass::extend(function($obj) {
+        ExtendableTestExampleImplementableClass::extend(function ($obj) {
             $obj->implementClassWith('ExtendableTestExampleBehaviorClass2');
             $obj->implementClassWith('ExtendableTestExampleBehaviorClass2');
             $obj->implementClassWith('ExtendableTestExampleBehaviorClass2');
@@ -296,6 +296,7 @@ public function getFoo()
 /*
  * Example class that has an invalid implementation
  */
+
 class ExtendableTestInvalidExtendableClass extends Extendable
 {
     public $implement = 24;
@@ -306,6 +307,7 @@ class ExtendableTestInvalidExtendableClass extends Extendable
 /*
  * Example class that has extensions enabled
  */
+
 class ExtendableTestExampleExtendableClass extends Extendable
 {
     public $implement = ['ExtendableTestExampleBehaviorClass1'];
@@ -357,6 +359,7 @@ public static function getName()
 /*
  * Example class with soft implement failure
  */
+
 class ExtendableTestExampleExtendableSoftImplementFakeClass extends Extendable
 {
     public $implement = ['@RabbleRabbleRabble'];
@@ -370,6 +373,7 @@ public static function getStatus()
 /*
  * Example class with soft implement success
  */
+
 class ExtendableTestExampleExtendableSoftImplementRealClass extends Extendable
 {
     public $implement = ['@ExtendableTestExampleBehaviorClass1'];
@@ -378,6 +382,7 @@ class ExtendableTestExampleExtendableSoftImplementRealClass extends Extendable
 /*
  * Example class with soft implement hybrid
  */
+
 class ExtendableTestExampleExtendableSoftImplementComboClass extends Extendable
 {
     public $implement = [
@@ -390,6 +395,7 @@ class ExtendableTestExampleExtendableSoftImplementComboClass extends Extendable
 /*
  * Example class that has extensions enabled using dot notation
  */
+
 class ExtendableTestExampleExtendableClassDotNotation extends Extendable
 {
     public $implement = ['ExtendableTest.ExampleBehaviorClass1'];

diff --git a/tests/Extension/ExtensionTest.php b/tests/Extension/ExtensionTest.php
@@ -22,6 +22,7 @@ public function testExtendingBehavior()
 /*
  * Example class that has extensions enabled
  */
+
 class ExtensionTestExampleExtendableClass extends Extendable
 {
     public $implement = ['ExtensionTestExampleBehaviorClass1'];

diff --git a/tests/Halcyon/DatasourceResolverTest.php b/tests/Halcyon/DatasourceResolverTest.php
@@ -1,8 +1,8 @@
 <?php
 
 use October\Rain\Filesystem\Filesystem;
-use October\Rain\Halcyon\Datasource\Resolver;
 use October\Rain\Halcyon\Datasource\FileDatasource;
+use October\Rain\Halcyon\Datasource\Resolver;
 
 class DatasourceResolverTest extends TestCase
 {