Pleets / dronephp

test/Error/ErrorTraitTest.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
     public function getContentsFromUrl($filename)
     {
         $headers = get_headers($url);
-        $exists = stripos($headers[0],"200 OK") ? true : false;
+        $exists = stripos($headers[0], "200 OK") ? true : false;
 
         if ($exists)
             return file_get_contents($filename);

Braces +17 added lines, -16 removed lines

@@ -90,13 +90,11 @@ 
         try
         {
             $ctrl->addNonExistingError();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -109,18 +107,20 @@ 
 
     public function getContentsFromFile($filename)
     {
-        if (file_exists($filename))
-            return file_get_contents($filename);
-        else
-            $this->error(Errno::FILE_NOT_FOUND, $filename);
+        if (file_exists($filename)) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error(Errno::FILE_NOT_FOUND, $filename);
+        }
     }
 
     public function getContentsFromFileWithoutFilenameOnError($filename)
     {
-        if (file_exists($filename))
-            return file_get_contents($filename);
-        else
-            $this->error(Errno::FILE_NOT_FOUND);
+        if (file_exists($filename)) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error(Errno::FILE_NOT_FOUND);
+        }
     }
 
     public function getContentsFromUrl($filename)
@@ -128,10 +128,11 @@ 
         $headers = get_headers($url);
         $exists = stripos($headers[0],"200 OK") ? true : false;
 
-        if ($exists)
-            return file_get_contents($filename);
-        else
-            $this->error("URL not found");
+        if ($exists) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error("URL not found");
+        }
     }
 
     public function addNonExistingError()

src/Error/ErrorTrait.php

Braces +17 added lines, -13 removed lines

@@ -92,15 +92,16 @@ 
      */
     protected function _error($code, $message = null)
     {
-        if (!is_null($code) && !is_integer($code))
-            throw new \InvalidArgumentException("Invalid type given. Integer expected");
+        if (!is_null($code) && !is_integer($code)) {
+                    throw new \InvalidArgumentException("Invalid type given. Integer expected");
+        }
 
-        if (is_null($code))
-            $code = preg_replace('/=|\/|\+/', "", base64_encode($message));
-        else
+        if (is_null($code)) {
+                    $code = preg_replace('/=|\/|\+/', "", base64_encode($message));
+        } else
         {
-            if (!array_key_exists($code, $this->standardErrors) && empty($message))
-                /*
+            if (!array_key_exists($code, $this->standardErrors) && empty($message)) {
+                            /*
                  * "This kind of exception should lead directly to a fix in your code"
                  * Non-standard errors must have a message to describe the error, make sure
                  * you execute the error() method with a message as the second parameter.
@@ -108,16 +109,18 @@ 
                  * Ref: http://php.net/manual/en/class.logicexception.php
                  */
                 throw new \LogicException('The message does not be empty in non-standard errors!');
+            }
         }
 
-        if (!array_key_exists($code, $this->errors))
-            $this->errors[$code] = (array_key_exists($code, $this->standardErrors))
+        if (!array_key_exists($code, $this->errors)) {
+                    $this->errors[$code] = (array_key_exists($code, $this->standardErrors))
                 ?
                     is_null($message)
                         ? preg_replace('/\s\'%[a-zA-Z]*%\'/', $message, $this->standardErrors[$code])
                         # if $message is not null it will replace the %file% wildcard
                         : preg_replace('/%[a-zA-Z]*%/', $message, $this->standardErrors[$code])
                 : $message;
+        }
     }
 
     function __call($method, $arguments)
@@ -127,10 +130,11 @@ 
             switch (count($arguments))
             {
                 case 1:
-                    if (is_integer($arguments[0]))
-                        return call_user_func([$this, '_error'], array_shift($arguments));
-                    else
-                        return call_user_func([$this, '_error'], null, array_shift($arguments));
+                    if (is_integer($arguments[0])) {
+                                            return call_user_func([$this, '_error'], array_shift($arguments));
+                    } else {
+                                            return call_user_func([$this, '_error'], null, array_shift($arguments));
+                    }
                     break;
                 case 2:
                     return call_user_func([$this, '_error'], $arguments[0], $arguments[1]);