spiral / framework

src/Config/src/Loader/JsonLoader.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $content = file_get_contents($filename);
         $data = json_decode($content, true);
 
-        if (is_null($data)) {
+        if (is_null($data)){
             throw new LoaderException(json_last_error_msg(), json_last_error());
         }
 

Braces +2 added lines, -1 removed lines

@@ -23,7 +23,8 @@
         $content = file_get_contents($filename);
         $data = json_decode($content, true);
 
-        if (is_null($data)) {
+        if (is_null($data))
+        {
             throw new LoaderException(json_last_error_msg(), json_last_error());
         }
 

src/Config/src/ConfigManager.php

Spacing +11 added lines, -11 removed lines

@@ -69,11 +69,11 @@ 
      */
     public function setDefaults(string $section, array $data): void
     {
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section])){
             throw new ConfiguratorException("Unable to set default config `{$section}` more than once.");
         }
 
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section])){
             throw new ConfigDeliveredException("Unable to set default config `{$section}`, config has been loaded.");
         }
 
@@ -85,8 +85,8 @@ 
      */
     public function modify(string $section, PatchInterface $patch): array
     {
-        if (isset($this->instances[$section])) {
-            if ($this->strict) {
+        if (isset($this->instances[$section])){
+            if ($this->strict){
                 throw new ConfigDeliveredException(
                     "Unable to patch config `{$section}`, config object has already been delivered."
                 );
@@ -97,9 +97,9 @@ 
 
         $data = $this->getConfig($section);
 
-        try {
+        try{
             return $this->data[$section] = $patch->patch($data);
-        } catch (PatchException $e) {
+        }catch (PatchException $e){
             throw new PatchException("Unable to modify config `{$section}`.", $e->getCode(), $e);
         }
     }
@@ -109,18 +109,18 @@ 
      */
     public function getConfig(string $section = null): array
     {
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section])){
             return $this->data[$section];
         }
 
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section])){
             $data = [];
-            if ($this->loader->has($section)) {
+            if ($this->loader->has($section)){
                 $data = $this->loader->load($section);
             }
 
             $data = array_merge($this->defaults[$section], $data);
-        } else {
+        }else{
             $data = $this->loader->load($section);
         }
 
@@ -133,7 +133,7 @@ 
     public function createInjection(\ReflectionClass $class, string $context = null)
     {
         $config = $class->getConstant('CONFIG');
-        if (isset($this->instances[$config])) {
+        if (isset($this->instances[$config])){
             return $this->instances[$config];
         }
 

Braces +24 added lines, -11 removed lines

@@ -69,11 +69,13 @@ 
      */
     public function setDefaults(string $section, array $data): void
     {
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section]))
+        {
             throw new ConfiguratorException("Unable to set default config `{$section}` more than once.");
         }
 
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section]))
+        {
             throw new ConfigDeliveredException("Unable to set default config `{$section}`, config has been loaded.");
         }
 
@@ -85,8 +87,10 @@ 
      */
     public function modify(string $section, PatchInterface $patch): array
     {
-        if (isset($this->instances[$section])) {
-            if ($this->strict) {
+        if (isset($this->instances[$section]))
+        {
+            if ($this->strict)
+            {
                 throw new ConfigDeliveredException(
                     "Unable to patch config `{$section}`, config object has already been delivered."
                 );
@@ -97,9 +101,12 @@ 
 
         $data = $this->getConfig($section);
 
-        try {
+        try
+        {
             return $this->data[$section] = $patch->patch($data);
-        } catch (PatchException $e) {
+        }
+        catch (PatchException $e)
+        {
             throw new PatchException("Unable to modify config `{$section}`.", $e->getCode(), $e);
         }
     }
@@ -109,18 +116,23 @@ 
      */
     public function getConfig(string $section = null): array
     {
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section]))
+        {
             return $this->data[$section];
         }
 
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section]))
+        {
             $data = [];
-            if ($this->loader->has($section)) {
+            if ($this->loader->has($section))
+            {
                 $data = $this->loader->load($section);
             }
 
             $data = array_merge($this->defaults[$section], $data);
-        } else {
+        }
+        else
+        {
             $data = $this->loader->load($section);
         }
 
@@ -133,7 +145,8 @@ 
     public function createInjection(\ReflectionClass $class, string $context = null)
     {
         $config = $class->getConstant('CONFIG');
-        if (isset($this->instances[$config])) {
+        if (isset($this->instances[$config]))
+        {
             return $this->instances[$config];
         }
 

src/Config/src/Patch/Delete.php

Spacing +6 added lines, -6 removed lines

@@ -45,20 +45,20 @@
      */
     public function patch(array $config): array
     {
-        try {
+        try{
             $target = &$this->dotGet($config, $this->position);
 
-            if ($this->key !== null) {
+            if ($this->key !== null){
                 unset($target[$this->key]);
-            } else {
-                foreach ($target as $key => $value) {
-                    if ($value === $this->value) {
+            }else{
+                foreach ($target as $key => $value){
+                    if ($value === $this->value){
                         unset($target[$key]);
                         break;
                     }
                 }
             }
-        } catch (DotNotFoundException $e) {
+        }catch (DotNotFoundException $e){
             // doing nothing when section not found
         }
 

Braces +14 added lines, -6 removed lines

@@ -45,20 +45,28 @@
      */
     public function patch(array $config): array
     {
-        try {
+        try
+        {
             $target = &$this->dotGet($config, $this->position);
 
-            if ($this->key !== null) {
+            if ($this->key !== null)
+            {
                 unset($target[$this->key]);
-            } else {
-                foreach ($target as $key => $value) {
-                    if ($value === $this->value) {
+            }
+            else
+            {
+                foreach ($target as $key => $value)
+                {
+                    if ($value === $this->value)
+                    {
                         unset($target[$key]);
                         break;
                     }
                 }
             }
-        } catch (DotNotFoundException $e) {
+        }
+        catch (DotNotFoundException $e)
+        {
             // doing nothing when section not found
         }
 

src/Config/src/Patch/Append.php

Spacing +4 added lines, -4 removed lines

@@ -46,15 +46,15 @@
      */
     public function patch(array $config): array
     {
-        try {
+        try{
             $target = &$this->dotGet($config, $this->position);
 
-            if ($this->key !== null) {
+            if ($this->key !== null){
                 $target[$this->key] = $this->value;
-            } else {
+            }else{
                 $target[] = $this->value;
             }
-        } catch (DotNotFoundException $e) {
+        }catch (DotNotFoundException $e){
             throw new PatchException($e->getMessage(), $e->getCode(), $e);
         }
 

Braces +10 added lines, -4 removed lines

@@ -46,15 +46,21 @@
      */
     public function patch(array $config): array
     {
-        try {
+        try
+        {
             $target = &$this->dotGet($config, $this->position);
 
-            if ($this->key !== null) {
+            if ($this->key !== null)
+            {
                 $target[$this->key] = $this->value;
-            } else {
+            }
+            else
+            {
                 $target[] = $this->value;
             }
-        } catch (DotNotFoundException $e) {
+        }
+        catch (DotNotFoundException $e)
+        {
             throw new PatchException($e->getMessage(), $e->getCode(), $e);
         }
 

src/Config/src/Patch/Traits/DotTrait.php

Spacing +4 added lines, -4 removed lines

@@ -23,14 +23,14 @@
     private function &dotGet(array &$data, string $name)
     {
         //Generating path relative to a given name and prefix
-        $path = (!empty($this->prefix) ? $this->prefix . '.' : '') . $name;
-        if (empty($path)) {
+        $path = (!empty($this->prefix) ? $this->prefix.'.' : '').$name;
+        if (empty($path)){
             return $data;
         }
 
         $path = explode('.', rtrim($path, '.'));
-        foreach ($path as $step) {
-            if (!is_array($data) || !array_key_exists($step, $data)) {
+        foreach ($path as $step){
+            if (!is_array($data) || !array_key_exists($step, $data)){
                 throw new DotNotFoundException("Unable to find config element '{$name}'.");
             }
             $data = &$data[$step];

Braces +6 added lines, -3 removed lines

@@ -24,13 +24,16 @@
     {
         //Generating path relative to a given name and prefix
         $path = (!empty($this->prefix) ? $this->prefix . '.' : '') . $name;
-        if (empty($path)) {
+        if (empty($path))
+        {
             return $data;
         }
 
         $path = explode('.', rtrim($path, '.'));
-        foreach ($path as $step) {
-            if (!is_array($data) || !array_key_exists($step, $data)) {
+        foreach ($path as $step)
+        {
+            if (!is_array($data) || !array_key_exists($step, $data))
+            {
                 throw new DotNotFoundException("Unable to find config element '{$name}'.");
             }
             $data = &$data[$step];

src/Config/src/Patch/Prepend.php

Spacing +4 added lines, -4 removed lines

@@ -46,15 +46,15 @@
      */
     public function patch(array $config): array
     {
-        try {
+        try{
             $target = &$this->dotGet($config, $this->position);
 
-            if ($this->key !== null) {
+            if ($this->key !== null){
                 $target = array_merge([$this->key => $this->value], $target);
-            } else {
+            }else{
                 array_unshift($target, $this->value);
             }
-        } catch (DotNotFoundException $e) {
+        }catch (DotNotFoundException $e){
             throw new PatchException($e->getMessage(), $e->getCode(), $e);
         }
 

Braces +10 added lines, -4 removed lines

@@ -46,15 +46,21 @@
      */
     public function patch(array $config): array
     {
-        try {
+        try
+        {
             $target = &$this->dotGet($config, $this->position);
 
-            if ($this->key !== null) {
+            if ($this->key !== null)
+            {
                 $target = array_merge([$this->key => $this->value], $target);
-            } else {
+            }
+            else
+            {
                 array_unshift($target, $this->value);
             }
-        } catch (DotNotFoundException $e) {
+        }
+        catch (DotNotFoundException $e)
+        {
             throw new PatchException($e->getMessage(), $e->getCode(), $e);
         }
 

src/Config/tests/BaseTest.php

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
 
     protected function getFactory(string $directory = null, bool $strict = true): ConfigManager
     {
-        if (is_null($directory)) {
+        if (is_null($directory))
+        {
             $directory = __DIR__ . '/fixtures';
         }
 

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 
     protected function getFactory(string $directory = null, bool $strict = true): ConfigManager
     {
-        if (is_null($directory)) {
-            $directory = __DIR__ . '/fixtures';
+        if (is_null($directory)){
+            $directory = __DIR__.'/fixtures';
         }
 
         return new ConfigManager(

src/Files/tests/DirectoriesTest.php

Spacing +24 added lines, -24 removed lines

@@ -32,7 +32,7 @@ 
     public function testEnsureDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/';
+        $directory = self::FIXTURE_DIRECTORY.'directory/';
 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
@@ -46,7 +46,7 @@ 
     public function testEnsureExistedDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/';
+        $directory = self::FIXTURE_DIRECTORY.'directory/';
 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
@@ -65,7 +65,7 @@ 
     public function testEnsureNestedDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/sub/other';
+        $directory = self::FIXTURE_DIRECTORY.'directory/sub/other';
 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
@@ -79,7 +79,7 @@ 
     public function testEnsureNestedDirectoryNoRecursivePermissions(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/sub/other';
+        $directory = self::FIXTURE_DIRECTORY.'directory/sub/other';
 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
@@ -93,14 +93,14 @@ 
     public function testEnsureExistedNestedDirectory(): void
     {
         $files = new Files();
-        $directory = self::FIXTURE_DIRECTORY . 'directory/sub/other';
+        $directory = self::FIXTURE_DIRECTORY.'directory/sub/other';
 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
 
-        mkdir(self::FIXTURE_DIRECTORY . 'directory');
-        mkdir(self::FIXTURE_DIRECTORY . 'directory/sub');
-        mkdir(self::FIXTURE_DIRECTORY . 'directory/sub/other');
+        mkdir(self::FIXTURE_DIRECTORY.'directory');
+        mkdir(self::FIXTURE_DIRECTORY.'directory/sub');
+        mkdir(self::FIXTURE_DIRECTORY.'directory/sub/other');
 
         $this->assertTrue($files->exists($directory));
         $this->assertTrue($files->isDirectory($directory));
@@ -114,13 +114,13 @@ 
     public function testDeleteDirectoryContent(): void
     {
         $files = new Files();
-        $baseDirectory = self::FIXTURE_DIRECTORY . 'directory/';
-        $directory = $baseDirectory . 'sub/other';
+        $baseDirectory = self::FIXTURE_DIRECTORY.'directory/';
+        $directory = $baseDirectory.'sub/other';
 
         $filenames = [
-            $baseDirectory . 'test.file',
-            $directory . 'other.file',
-            $directory . '.sample',
+            $baseDirectory.'test.file',
+            $directory.'other.file',
+            $directory.'.sample',
         ];
 
         $this->assertFalse($files->exists($baseDirectory));
@@ -137,7 +137,7 @@ 
         $this->assertTrue($files->exists($directory));
         $this->assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             $this->assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             $this->assertTrue($files->exists($filename));
@@ -151,7 +151,7 @@ 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             $this->assertFalse($files->exists($filename));
         }
     }
@@ -159,13 +159,13 @@ 
     public function testDeleteDirectory(): void
     {
         $files = new Files();
-        $baseDirectory = self::FIXTURE_DIRECTORY . 'directory/';
-        $directory = $baseDirectory . 'sub/other';
+        $baseDirectory = self::FIXTURE_DIRECTORY.'directory/';
+        $directory = $baseDirectory.'sub/other';
 
         $filenames = [
-            $baseDirectory . 'test.file',
-            $directory . 'other.file',
-            $directory . '.sample',
+            $baseDirectory.'test.file',
+            $directory.'other.file',
+            $directory.'.sample',
         ];
 
         $this->assertFalse($files->exists($baseDirectory));
@@ -182,7 +182,7 @@ 
         $this->assertTrue($files->exists($directory));
         $this->assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             $this->assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             $this->assertTrue($files->exists($filename));
@@ -196,7 +196,7 @@ 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename){
             $this->assertFalse($files->exists($filename));
         }
     }
@@ -207,8 +207,8 @@ 
 
         $files = new Files();
 
-        $files->write(self::FIXTURE_DIRECTORY . 'test', 'data');
-        $files->deleteDirectory(self::FIXTURE_DIRECTORY . 'test');
+        $files->write(self::FIXTURE_DIRECTORY.'test', 'data');
+        $files->deleteDirectory(self::FIXTURE_DIRECTORY.'test');
     }
 
     public function testGetFiles(): void

Braces +8 added lines, -4 removed lines

@@ -137,7 +137,8 @@ 
         $this->assertTrue($files->exists($directory));
         $this->assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             $this->assertTrue($files->exists($filename));
@@ -151,7 +152,8 @@ 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
         }
     }
@@ -182,7 +184,8 @@ 
         $this->assertTrue($files->exists($directory));
         $this->assertTrue($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
             $files->write($filename, 'random-data');
             $this->assertTrue($files->exists($filename));
@@ -196,7 +199,8 @@ 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->isDirectory($directory));
 
-        foreach ($filenames as $filename) {
+        foreach ($filenames as $filename)
+        {
             $this->assertFalse($files->exists($filename));
         }
     }

src/Files/tests/IOTest.php

Spacing +20 added lines, -20 removed lines

@@ -34,7 +34,7 @@ 
     {
         $files = new Files();
 
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
         $this->assertFalse($files->exists($filename));
 
         $files->write($filename, 'some-data');
@@ -47,8 +47,8 @@ 
     {
         $files = new Files();
 
-        $directory = self::FIXTURE_DIRECTORY . '/directory/abc/';
-        $filename = $directory . 'test.txt';
+        $directory = self::FIXTURE_DIRECTORY.'/directory/abc/';
+        $filename = $directory.'test.txt';
 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->exists($filename));
@@ -66,7 +66,7 @@ 
     {
         $files = new Files();
 
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
         $this->assertFalse($files->exists($filename));
 
         $files->write($filename, 'some-data');
@@ -82,7 +82,7 @@ 
 
         $files = new Files();
 
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
         $this->assertFalse($files->exists($filename));
 
         $files->read($filename);
@@ -101,14 +101,14 @@ 
         $this->expectException(FileNotFoundException::class);
 
         $files = new Files();
-        $files->getPermissions(self::FIXTURE_DIRECTORY . '/missing');
+        $files->getPermissions(self::FIXTURE_DIRECTORY.'/missing');
     }
 
     public function testAppend(): void
     {
         $files = new Files();
 
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
         $this->assertFalse($files->exists($filename));
 
         $files->append($filename, 'some-data');
@@ -124,8 +124,8 @@ 
     {
         $files = new Files();
 
-        $directory = self::FIXTURE_DIRECTORY . '/directory/abc/';
-        $filename = $directory . 'test.txt';
+        $directory = self::FIXTURE_DIRECTORY.'/directory/abc/';
+        $filename = $directory.'test.txt';
 
         $this->assertFalse($files->exists($directory));
         $this->assertFalse($files->exists($filename));
@@ -146,7 +146,7 @@ 
     {
         $files = new Files();
 
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         $this->assertFalse($files->exists($filename));
         $files->touch($filename);
@@ -156,7 +156,7 @@ 
     public function testDelete(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         $this->assertFalse($files->exists($filename));
 
@@ -170,7 +170,7 @@ 
     public function testDeleteMissingFile(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
 
         $this->assertFalse($files->exists($filename));
         $files->delete($filename);
@@ -179,8 +179,8 @@ 
     public function testCopy(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
-        $destination = self::FIXTURE_DIRECTORY . '/new.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
+        $destination = self::FIXTURE_DIRECTORY.'/new.txt';
 
         $this->assertFalse($files->exists($filename));
         $files->write($filename, 'some-data');
@@ -203,8 +203,8 @@ 
         $this->expectException(FileNotFoundException::class);
 
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
-        $destination = self::FIXTURE_DIRECTORY . '/new.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
+        $destination = self::FIXTURE_DIRECTORY.'/new.txt';
 
         $this->assertFalse($files->exists($filename));
         $files->copy($filename, $destination);
@@ -213,8 +213,8 @@ 
     public function testMove(): void
     {
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
-        $destination = self::FIXTURE_DIRECTORY . '/new.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
+        $destination = self::FIXTURE_DIRECTORY.'/new.txt';
 
         $this->assertFalse($files->exists($filename));
         $files->write($filename, 'some-data');
@@ -237,8 +237,8 @@ 
         $this->expectException(FileNotFoundException::class);
 
         $files = new Files();
-        $filename = self::FIXTURE_DIRECTORY . '/test.txt';
-        $destination = self::FIXTURE_DIRECTORY . '/new.txt';
+        $filename = self::FIXTURE_DIRECTORY.'/test.txt';
+        $destination = self::FIXTURE_DIRECTORY.'/new.txt';
 
         $this->assertFalse($files->exists($filename));
         $files->move($filename, $destination);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
         $this->assertFalse($files->isDirectory($directory));
 
-        $files->write($filename, 'some-data', FilesInterface::READONLY, true);
+        $files->write($filename, 'some-data', FilesInterface::readonly, true);
 
         $this->assertTrue($files->isDirectory($directory));
         $this->assertTrue($files->exists($filename));