coderius / yii2-upload-file-behavior

src/UploadFileBehavior.php

Indentation +6 added lines, -8 removed lines

@@ -52,8 +52,6 @@ 
  *                    'uploadFileBehavior' => [
  *                        'class' => UploadFileBehavior::className(),
  *                        'nameOfAttributeStorage' => 'img_src',
-                    
-                    
  *                        'targets' => [
  *                            
  *                            [
@@ -173,8 +171,8 @@ 
     private $time = false;
 
         /**
-     * @inheritdoc
-     */
+         * @inheritdoc
+         */
     public function init()
     {
         parent::init();
@@ -206,9 +204,9 @@ 
         
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     public function events()
     {
         return [
@@ -381,7 +379,7 @@ 
         $baseName = $file->baseName;
         $ext = $file->extension;
         
-         return $this->newFileName ?
+            return $this->newFileName ?
             $this->newFileName . '.' . $file->extension :
             $file->baseName . '_' . $this->time . '.' . $file->extension;
     }

Braces +4 added lines, -5 removed lines

@@ -312,10 +312,9 @@ 
         if(is_string($path)){
             $path = rtrim($path, '/') . '/';
             $dirPath = \Yii::getAlias($path);
-        }
-        elseif ($path instanceof Closure || (is_array($path) && is_callable($path))) {
+        } elseif ($path instanceof Closure || (is_array($path) && is_callable($path))) {
             $dirPath = $path($this->owner->attributes);
-        }else{
+        } else{
             throw new InvalidCallException('Param `path` mast be string instanceof Closure or callable method.');
         }
 
@@ -325,7 +324,7 @@ 
     protected function getHendler($hendler, $tmp, $path){
         if ($hendler instanceof Closure || (is_array($hendler) && is_callable($hendler))) {
             $hendler($tmp, $path);
-        }elseif(is_array($hendler) && array_key_exists('type', $hendler) && array_key_exists('config', $hendler)){
+        } elseif(is_array($hendler) && array_key_exists('type', $hendler) && array_key_exists('config', $hendler)){
             if(!in_array($hendler['type'], self::supportedFileTypes()))
             {
                 throw new InvalidConfigException('File type not supported: ' . $hendler['type']);
@@ -341,7 +340,7 @@ 
                 break;
             }
 
-        }else{
+        } else{
             throw new InvalidCallException('Param `hendler` mast be instanceof Closure ,callable method or array with allowed configs.');
         }
 

Spacing +20 added lines, -21 removed lines

@@ -105,7 +105,7 @@ 
 class UploadFileBehavior extends Behavior
 {
     const TYPE_IMAGE = 'image';
-    const TYPE_FILE = 'file';//not supported yet
+    const TYPE_FILE = 'file'; //not supported yet
     
     /**
      * Name of attribute for recording file from form to ActiveRecord. DEfault name of attribute is `file`
@@ -220,7 +220,7 @@ 
         ];
     }
 
-    protected static function supportedFileTypes(){
+    protected static function supportedFileTypes() {
         return [
             self::TYPE_IMAGE
         ];
@@ -233,8 +233,8 @@ 
      */
     public function loadFile()
     {
-        if($this->isFile()){
-            $this->owner->file = $this->getFileInstance();//virtual attribute
+        if ($this->isFile()) {
+            $this->owner->file = $this->getFileInstance(); //virtual attribute
             $this->owner->{$this->nameOfAttributeStorage} = $this->getNewFileName();
         }
     }
@@ -267,8 +267,8 @@ 
      */
     public function afterDelete($event)
     {
-        if($this->deleteImageWithRecord){
-            foreach($this->targets as $target){
+        if ($this->deleteImageWithRecord) {
+            foreach ($this->targets as $target) {
                 $dirPath = $this->getPath($target['path']);
                 FileHelper::removeDirectory($dirPath);
             }    
@@ -287,16 +287,16 @@ 
     {
         if ($this->isFile() && $this->inScenario())
         {
-            foreach($this->targets as $target){
+            foreach ($this->targets as $target) {
                 $dirPath = $this->getPath($target['path']);
                 
-                if(!$insert){
+                if (!$insert) {
                     
                     FileHelper::removeDirectory($dirPath);
                 }
                 
                 FileHelper::createDirectory($dirPath);
-                $newFilePath = $dirPath . $this->getNewFileName();
+                $newFilePath = $dirPath.$this->getNewFileName();
 
                 $this->getHendler($target['hendler'], $this->getFileInstance()->tempName, $newFilePath);
                 
@@ -309,29 +309,29 @@ 
      * @param string $path
      * @return string $dirPath
      */
-    protected function getPath($path){
-        if(is_string($path)){
-            $path = rtrim($path, '/') . '/';
+    protected function getPath($path) {
+        if (is_string($path)) {
+            $path = rtrim($path, '/').'/';
             $dirPath = \Yii::getAlias($path);
         }
         elseif ($path instanceof Closure || (is_array($path) && is_callable($path))) {
             $dirPath = $path($this->owner->attributes);
-        }else{
+        } else {
             throw new InvalidCallException('Param `path` mast be string instanceof Closure or callable method.');
         }
 
         return $dirPath;
     }
 
-    protected function getHendler($hendler, $tmp, $path){
+    protected function getHendler($hendler, $tmp, $path) {
         if ($hendler instanceof Closure || (is_array($hendler) && is_callable($hendler))) {
             $hendler($tmp, $path);
-        }elseif(is_array($hendler) && array_key_exists('type', $hendler) && array_key_exists('config', $hendler)){
-            if(!in_array($hendler['type'], self::supportedFileTypes()))
+        }elseif (is_array($hendler) && array_key_exists('type', $hendler) && array_key_exists('config', $hendler)) {
+            if (!in_array($hendler['type'], self::supportedFileTypes()))
             {
-                throw new InvalidConfigException('File type not supported: ' . $hendler['type']);
+                throw new InvalidConfigException('File type not supported: '.$hendler['type']);
             }
-            switch($hendler['type']) {
+            switch ($hendler['type']) {
                 case self::TYPE_IMAGE:
                     $sizeW = $hendler['config']['size']['width'];
                     $sizeH = $hendler['config']['size']['height'];
@@ -342,7 +342,7 @@ 
                 break;
             }
 
-        }else{
+        } else {
             throw new InvalidCallException('Param `hendler` mast be instanceof Closure ,callable method or array with allowed configs.');
         }
 
@@ -383,8 +383,7 @@ 
         $ext = $file->extension;
         
          return $this->newFileName ?
-            $this->newFileName . '.' . $file->extension :
-            $file->baseName . '_' . $this->time . '.' . $file->extension;
+            $this->newFileName.'.'.$file->extension : $file->baseName.'_'.$this->time.'.'.$file->extension;
     }
 
     /**