Mykees / MkMediaBundle

Controller/MediasController.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
         }
     }
 
+    /**
+     * @param \Symfony\Component\HttpFoundation\FileBag $file
+     */
     private function initEvent($file,$model,$model_id)
     {
         $event = new UploadEvent();

Braces +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
                     'bundle'=>$bundle,
                 ]);
                 return JsonResponse($event->getMedia());
-            }else{
+            } else{
                 $response = new Response();
                 $response->setContent(json_encode(array(
                     'error'=>"Le format n'est pas valid"
@@ -125,7 +125,7 @@ 
                     'bundle'=>$bundle,
                     'model_id'=>$model_id
                 ]);
-            }else{
+            } else{
                 $response = new Response();
                 $response->setContent(json_encode(array(
                     'error'=>"Le format n'est pas valid"
@@ -187,7 +187,7 @@ 
                 'alt'=>$request->get('alt')
             ];
             $params['media'] = $this->getManage()->getRepository('MykeesMediaBundle:Media')->findOneBy(['name'=>$params['alt'],'model'=>$model]);
-        }else{
+        } else{
             $params = [
                 'media'=>$this->getManage()->getRepository('MykeesMediaBundle:Media')->find($id),
                 'class'=>null

Manager/MediaManager.php

Doc Comments +3 added lines

@@ -109,6 +109,9 @@
         return $this->em->getRepository('MykeesMediaBundle:Media')->queryForModelAndId($model,$model_id);
     }
 
+    /**
+     * @param string $model
+     */
     public function unlink($model, Media $media)
     {
         $info  = pathinfo($media->getFile());

Util/Urlizer.php

Doc Comments +1 added lines

@@ -232,6 +232,7 @@
     * Note: this function has been modified to simple return true or false
     * @author <hsivonen@iki.fi>
     * @param string UTF-8 encoded string
+    * @param string $str
     * @return boolean true if valid
     * @see http://hsivonen.iki.fi/php-utf8/
     */

Braces +31 added lines, -9 removed lines

@@ -39,17 +39,39 @@
     {
         $stringLength = strlen($string);
         for ($i = 0; $i < $stringLength; $i++) {
-            if (ord($string[$i]) < 0x80) continue; # 0bbbbbbb
-            elseif ((ord($string[$i]) & 0xE0) == 0xC0) $n=1; # 110bbbbb
-            elseif ((ord($string[$i]) & 0xF0) == 0xE0) $n=2; # 1110bbbb
-            elseif ((ord($string[$i]) & 0xF8) == 0xF0) $n=3; # 11110bbb
-            elseif ((ord($string[$i]) & 0xFC) == 0xF8) $n=4; # 111110bb
-            elseif ((ord($string[$i]) & 0xFE) == 0xFC) $n=5; # 1111110b
-            else return false; # Does not match any model
-            for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
-                if ((++$i == strlen($string)) || ((ord($string[$i]) & 0xC0) != 0x80))
+            if (ord($string[$i]) < 0x80) {
+                continue;
+            }
+            # 0bbbbbbb
+            elseif ((ord($string[$i]) & 0xE0) == 0xC0) {
+                $n=1;
+            }
+            # 110bbbbb
+            elseif ((ord($string[$i]) & 0xF0) == 0xE0) {
+                $n=2;
+            }
+            # 1110bbbb
+            elseif ((ord($string[$i]) & 0xF8) == 0xF0) {
+                $n=3;
+            }
+            # 11110bbb
+            elseif ((ord($string[$i]) & 0xFC) == 0xF8) {
+                $n=4;
+            }
+            # 111110bb
+            elseif ((ord($string[$i]) & 0xFE) == 0xFC) {
+                $n=5;
+            }
+            # 1111110b
+            else {
                 return false;
             }
+            # Does not match any model
+            for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+                if ((++$i == strlen($string)) || ((ord($string[$i]) & 0xC0) != 0x80)) {
+                                return false;
+                }
+            }
         }
         return true;
     }