eddturtle / direct-upload

src/Signature.php

Indentation +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
      */
     private $time = null;
 	
-	/**
+    /**
      * @var bool use AWS Accelerate
      */
     private $accelerate = false;
@@ -117,7 +117,7 @@ 
         $this->bucket = $bucket;
         $this->region = new Region($region);
 		
-		$this->accelerate = $accelerate;
+        $this->accelerate = $accelerate;
 
         $this->setOptions($options);
     }

Spacing +14 added lines, -14 removed lines

@@ -167,24 +167,24 @@ 
 
         $separator = (substr($url, -1) === "/" ? "" : "/");
 
-        return $url . $separator . urlencode($this->bucket);
+        return $url.$separator.urlencode($this->bucket);
     }
 
     private function buildAmazonUrl()
     {
-        $region = (string)$this->region;
+        $region = (string) $this->region;
 
         // Only the us-east-1 region is exempt from needing the region in the url.
         if ($region !== "us-east-1") {
-            $middle = "-" . $region;
+            $middle = "-".$region;
         } else {
             $middle = "";
         }
 
-        if($this->accelerate)
-            return "//" . urlencode($this->bucket) . "." . self::SERVICE . "-accelerate.amazonaws.com";
+        if ($this->accelerate)
+            return "//".urlencode($this->bucket).".".self::SERVICE."-accelerate.amazonaws.com";
         else
-            return "//" . self::SERVICE . $middle . ".amazonaws.com" . "/" . urlencode($this->bucket);
+            return "//".self::SERVICE.$middle.".amazonaws.com"."/".urlencode($this->bucket);
     }
 
     /**
@@ -210,7 +210,7 @@ 
         $this->options['acl'] = new Acl($this->options['acl']);
 
         // Return HTTP code must be a string
-        $this->options['success_status'] = (string)$this->options['success_status'];
+        $this->options['success_status'] = (string) $this->options['success_status'];
     }
 
     /**
@@ -242,7 +242,7 @@ 
 
         $inputs = [
             'Content-Type' => $this->options['content_type'],
-            'acl' => (string)$this->options['acl'],
+            'acl' => (string) $this->options['acl'],
             'success_action_status' => $this->options['success_status'],
             'policy' => $this->base64Policy,
             'X-amz-credential' => $this->credentials,
@@ -260,7 +260,7 @@ 
         if ($addKey) {
             // Note: The Key (filename) will need to be populated with JS on upload
             // if anything other than the filename is wanted.
-            $inputs['key'] = $this->options['valid_prefix'] . $this->options['default_filename'];
+            $inputs['key'] = $this->options['valid_prefix'].$this->options['default_filename'];
         }
 
         return $inputs;
@@ -277,7 +277,7 @@ 
     {
         $inputs = [];
         foreach ($this->getFormInputs($addKey) as $name => $value) {
-            $inputs[] = '<input type="hidden" name="' . $name . '" value="' . $value . '" />';
+            $inputs[] = '<input type="hidden" name="'.$name.'" value="'.$value.'" />';
         }
         return implode(PHP_EOL, $inputs);
     }
@@ -309,7 +309,7 @@ 
             'expiration' => $this->getExpirationDate(),
             'conditions' => [
                 ['bucket' => $this->bucket],
-                ['acl' => (string)$this->options['acl']],
+                ['acl' => (string) $this->options['acl']],
                 ['starts-with', '$key', $this->options['valid_prefix']],
                 $this->getPolicyContentTypeArray(),
                 ['content-length-range', 0, $this->mbToBytes($this->options['max_file_size'])],
@@ -336,7 +336,7 @@ 
     private function addAdditionalInputs($policy)
     {
         foreach ($this->options['additional_inputs'] as $name => $value) {
-            $policy['conditions'][] = ['starts-with', '$' . $name, $value];
+            $policy['conditions'][] = ['starts-with', '$'.$name, $value];
         }
         return $policy;
     }
@@ -348,13 +348,13 @@ 
     {
         $signatureData = [
             $this->getShortDateFormat(),
-            (string)$this->region,
+            (string) $this->region,
             self::SERVICE,
             self::REQUEST_TYPE
         ];
 
         // Iterates over the data (defined in the array above), hashing it each time.
-        $initial = 'AWS4' . $this->secret;
+        $initial = 'AWS4'.$this->secret;
         $signingKey = array_reduce($signatureData, function($key, $data) {
             return $this->keyHash($data, $key);
         }, $initial);

Braces +5 added lines, -4 removed lines

@@ -181,10 +181,11 @@
             $middle = "";
         }
 
-        if($this->accelerate)
-            return "//" . urlencode($this->bucket) . "." . self::SERVICE . "-accelerate.amazonaws.com";
-        else
-            return "//" . self::SERVICE . $middle . ".amazonaws.com" . "/" . urlencode($this->bucket);
+        if($this->accelerate) {
+                    return "//" . urlencode($this->bucket) . "." . self::SERVICE . "-accelerate.amazonaws.com";
+        } else {
+                    return "//" . self::SERVICE . $middle . ".amazonaws.com" . "/" . urlencode($this->bucket);
+        }
     }
 
     /**