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();

Spacing +33 added lines, -33 removed lines

@@ -27,24 +27,24 @@ 
      * @param $editor
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function indexAction( $model, $bundle, $model_id, $editor )
+    public function indexAction($model, $bundle, $model_id, $editor)
     {
         $params = [
             'medias'=>$this->get('mk.media.manager')->findMediasByModelAndId($model, $model_id),
             'entity'=>$this->getManage()->getRepository("$bundle:$model")->find($model_id),
-            'mode'=>$editor=='true' ? $editor : null,
-            'url'=>$editor == "true" ? ['model'=>$model,'bundle'=>$bundle,'model_id'=>$model_id,'mode'=>'true'] : ['model'=>$model,'bundle'=>$bundle,'model_id'=>$model_id]
+            'mode'=>$editor == 'true' ? $editor : null,
+            'url'=>$editor == "true" ? ['model'=>$model, 'bundle'=>$bundle, 'model_id'=>$model_id, 'mode'=>'true'] : ['model'=>$model, 'bundle'=>$bundle, 'model_id'=>$model_id]
         ];
         $form = $this->createForm(
             new MediaType(),
             new Media,
             [
-                'action' => $this->generateUrl('mykees_media_add',$params['url']),
+                'action' => $this->generateUrl('mykees_media_add', $params['url']),
                 'method' => 'POST',
             ]
         );
 
-        return $this->render('MykeesMediaBundle:Media:index.html.twig',[
+        return $this->render('MykeesMediaBundle:Media:index.html.twig', [
             'form'=>$form->createView(),
             'model'=>$model,
             'bundle'=> $bundle,
@@ -66,21 +66,21 @@ 
             'mode'=>$request->get('mode')
         ];
 
-        if( $request->isXmlHttpRequest() && $requestArray['file'] )
+        if ($request->isXmlHttpRequest() && $requestArray['file'])
         {
             // Init Event
             $event = $this->initEvent($requestArray['file'], $model);
 
-            if($event->getMedia())
+            if ($event->getMedia())
             {
-                return $this->render('MykeesMediaBundle:Media:upload/upload_list.html.twig',[
+                return $this->render('MykeesMediaBundle:Media:upload/upload_list.html.twig', [
                     'params'=>$requestArray,
                     'media'=>$event->getMedia(),
                     'model'=>$model,
                     'bundle'=>$bundle,
                 ]);
                 return JsonResponse($event->getMedia());
-            }else{
+            }else {
                 $response = new Response();
                 $response->setContent(json_encode(array(
                     'error'=>"Le format n'est pas valid"
@@ -98,7 +98,7 @@ 
      * @throws \Exception
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function addAction( Request $request )
+    public function addAction(Request $request)
     {
         $requestArray = [
             'file'=>$request->files,
@@ -108,24 +108,24 @@ 
         $bundle = $request->get('bundle');
         $model_id = $request->get('model_id');
 
-        if( $request->isXmlHttpRequest() && $requestArray['file'] )
+        if ($request->isXmlHttpRequest() && $requestArray['file'])
         {
             //Init Event
-            $event = $this->initEvent($requestArray['file'],$model,$model_id);
+            $event = $this->initEvent($requestArray['file'], $model, $model_id);
 
-            if($event->getMedia())
+            if ($event->getMedia())
             {
                 $requestArray['entity'] = $this->getManage()->getRepository("$bundle:$model")->find($model_id);
 
 
-                return $this->render('MykeesMediaBundle:Media:upload/upload_list.html.twig',[
+                return $this->render('MykeesMediaBundle:Media:upload/upload_list.html.twig', [
                     'params'=>$requestArray,
                     'media'=>$event->getMedia(),
                     'model'=>$model,
                     'bundle'=>$bundle,
                     'model_id'=>$model_id
                 ]);
-            }else{
+            }else {
                 $response = new Response();
                 $response->setContent(json_encode(array(
                     'error'=>"Le format n'est pas valid"
@@ -160,10 +160,10 @@ 
      * @param Request $request
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function thumbAction( $model, $bundle, $model_id, $id, Request $request )
+    public function thumbAction($model, $bundle, $model_id, $id, Request $request)
     {
-        $media  = $this->getManage()->getRepository("MykeesMediaBundle:Media")->find($id);
-        $entity  = $this->getManage()->getRepository("$bundle:$model")->find($model_id);
+        $media = $this->getManage()->getRepository("MykeesMediaBundle:Media")->find($id);
+        $entity = $this->getManage()->getRepository("$bundle:$model")->find($model_id);
         $entity->setThumb($media);
         $this->getManage()->persist($entity);
         $this->getManage()->flush();
@@ -178,16 +178,16 @@ 
      * @param Request $request
      * @return Response
      */
-    public function showAction( $model=null, $id = null, Request $request )
+    public function showAction($model = null, $id = null, Request $request)
     {
-        if( !$id )
+        if (!$id)
         {
             $params = [
                 'class'=>$request->get('class'),
                 'alt'=>$request->get('alt')
             ];
-            $params['media'] = $this->getManage()->getRepository('MykeesMediaBundle:Media')->findOneBy(['name'=>$params['alt'],'model'=>$model]);
-        }else{
+            $params['media'] = $this->getManage()->getRepository('MykeesMediaBundle:Media')->findOneBy(['name'=>$params['alt'], 'model'=>$model]);
+        }else {
             $params = [
                 'media'=>$this->getManage()->getRepository('MykeesMediaBundle:Media')->find($id),
                 'class'=>null
@@ -197,18 +197,18 @@ 
             new MediaShowType(),
             $params['media'],
             [
-                'action' => $this->generateUrl('mykees_media_show',['model'=>$model,'id'=>$id]),
+                'action' => $this->generateUrl('mykees_media_show', ['model'=>$model, 'id'=>$id]),
                 'method' => 'POST',
             ]
         );
-        if($request->getMethod() == "POST")
+        if ($request->getMethod() == "POST")
         {
             $media = $request->request->all();
-            return $this->render('MykeesMediaBundle:Media:tinymce.html.twig',['media'=>$media]);
+            return $this->render('MykeesMediaBundle:Media:tinymce.html.twig', ['media'=>$media]);
         }
 
-        return $this->render('MykeesMediaBundle:Media:show/show.html.twig',[
-            'media'=>$params['media'],'form'=>$form->createView(),'class'=>$params['class'],"model"=>$model
+        return $this->render('MykeesMediaBundle:Media:show/show.html.twig', [
+            'media'=>$params['media'], 'form'=>$form->createView(), 'class'=>$params['class'], "model"=>$model
         ]);
     }
 
@@ -220,16 +220,16 @@ 
      * @param $id
      * @return Response
      */
-    public function deleteAction( $model, $bundle, $id )
+    public function deleteAction($model, $bundle, $id)
     {
-        if( $id )
+        if ($id)
         {
             $media = $this->getManage()->getRepository('MykeesMediaBundle:Media')->find($id);
             $media_manager = $this->get('mk.media.manager');
-            $media_manager->unlink($model,$media);
+            $media_manager->unlink($model, $media);
 
             $model_referer = $this->getManage()->getRepository("$bundle:$model")->find($media->getMediableId());
-            if(method_exists($model_referer,'getThumb') && $model_referer->getThumb() !== null && $model_referer->getThumb()->getId() == $media->getId())
+            if (method_exists($model_referer, 'getThumb') && $model_referer->getThumb() !== null && $model_referer->getThumb()->getId() == $media->getId())
             {
                 $model_referer->setThumb(null);
             }
@@ -262,7 +262,7 @@ 
     {
         $params = [
             'medias'=>$this->get('mk.media.manager')->findMediasByModel($model),
-            'url'=> ['model'=>$model,'bundle'=>$bundle]
+            'url'=> ['model'=>$model, 'bundle'=>$bundle]
         ];
         $form = $this->createForm(
             new MediaType(),
@@ -273,7 +273,7 @@ 
             ]
         );
 
-        return $this->render('MykeesMediaBundle:Media:basic-uploader.html.twig',[
+        return $this->render('MykeesMediaBundle:Media:basic-uploader.html.twig', [
             'form'=>$form->createView(),
             'model'=>$model,
             'bundle'=> $bundle,

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());

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
     public $rootDir;
     public $resize_parameters;
 
-    public function __construct( ManagerRegistry $managerRegistry, $rootDir,$resize_parameters )
+    public function __construct(ManagerRegistry $managerRegistry, $rootDir, $resize_parameters)
     {
         $this->em = $managerRegistry->getManager();
         $this->rootDir = $rootDir;
@@ -30,7 +30,7 @@ 
 
     public function webroot()
     {
-        return $this->rootDir . '/../web/img/';
+        return $this->rootDir.'/../web/img/';
     }
 
     /**
@@ -52,7 +52,7 @@ 
         $model_info = $this->getModelInfos($models);
         $queryResult = $this->em->getRepository("MykeesMediaBundle:Media")->findForArrayModels($model_info);
 
-        return $this->refreshMediasArray($queryResult,$models);
+        return $this->refreshMediasArray($queryResult, $models);
     }
 
     /**
@@ -73,9 +73,9 @@ 
         $model = Reflection::getClassShortName($obj);
         $model_id = $obj->getId();
 
-        $queryResult = $this->em->getRepository('MykeesMediaBundle:Media')->findForModelAndId($model,$model_id);
+        $queryResult = $this->em->getRepository('MykeesMediaBundle:Media')->findForModelAndId($model, $model_id);
 
-        return $this->refreshMedias($queryResult,$obj);
+        return $this->refreshMedias($queryResult, $obj);
     }
 
     /**
@@ -85,7 +85,7 @@ 
      */
     public function getQueryByModelAndId($model_name, $model_id)
     {
-        return $this->em->getRepository('MykeesMediaBundle:Media')->queryForModelAndId($model_name,$model_id);
+        return $this->em->getRepository('MykeesMediaBundle:Media')->queryForModelAndId($model_name, $model_id);
     }
 
     /**
@@ -106,38 +106,38 @@ 
         $model = Reflection::getClassShortName($obj);
         $model_id = $obj->getId();
 
-        return $this->em->getRepository('MykeesMediaBundle:Media')->queryForModelAndId($model,$model_id);
+        return $this->em->getRepository('MykeesMediaBundle:Media')->queryForModelAndId($model, $model_id);
     }
 
     public function unlink($model, Media $media)
     {
-        $info  = pathinfo($media->getFile());
+        $info = pathinfo($media->getFile());
 
-        $this->removeSizes($model,$info);
+        $this->removeSizes($model, $info);
 
-        if(file_exists($this->webroot() . $media->getFile()))
+        if (file_exists($this->webroot().$media->getFile()))
         {
-            return unlink($this->webroot() . $media->getFile());
+            return unlink($this->webroot().$media->getFile());
         }
 
         return false;
     }
 
-    public function removeSizes($model,$info)
+    public function removeSizes($model, $info)
     {
-        if(!empty($this->resize_parameters[$model]))
+        if (!empty($this->resize_parameters[$model]))
         {
-            if(!empty($this->resize_parameters[$model]['size']))
+            if (!empty($this->resize_parameters[$model]['size']))
             {
                 $sizes = $this->resize_parameters[$model]['size'];
 
-                foreach($sizes as $k=>$size)
+                foreach ($sizes as $k=>$size)
                 {
                     $w = $size['width'];
                     $h = $size['height'];
-                    $resizedFile = $this->webroot() . $info['dirname'] . '/' . $info['filename'] . "_$w" . "x$h" . '.jpg';
+                    $resizedFile = $this->webroot().$info['dirname'].'/'.$info['filename']."_$w"."x$h".'.jpg';
 
-                    if(file_exists($resizedFile))
+                    if (file_exists($resizedFile))
                     {
                         unlink($resizedFile);
                     }
@@ -160,12 +160,12 @@ 
 	/**
 	 * @param Mediable $model
 	 */
-    public function removeAllMediasForModel( Mediable $model )
+    public function removeAllMediasForModel(Mediable $model)
     {
         $model_name = Reflection::getClassShortName($model);
         $model_id = $model->getId();
 
-        if(method_exists($model,'getThumb') && $model->getThumb() !== null)
+        if (method_exists($model, 'getThumb') && $model->getThumb() !== null)
         {
             $model->setThumb(null);
         }
@@ -173,7 +173,7 @@ 
             'model'=>$model_name,
             'modelId'=>$model_id
         ]);
-        foreach($medias as $k=>$media)
+        foreach ($medias as $k=>$media)
         {
             $this->unlink($model_name, $media);
             $this->remove($media);
@@ -183,6 +183,6 @@ 
     /**
      * Remodel ALL Medias
      */
-    public function removeAll(){}
+    public function removeAll() {}
 
 }

Indentation +12 added lines, -12 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Created by PhpStorm.
- * User: Rafidion Michael
- * Date: 30/11/2014
- * Time: 03:40
- */
+     * Created by PhpStorm.
+     * User: Rafidion Michael
+     * Date: 30/11/2014
+     * Time: 03:40
+     */
 
 namespace Mykees\MediaBundle\Manager;
 
@@ -146,10 +146,10 @@ 
         }
     }
 
-	/**
-	 * @param Media $media
-	 * @return bool
-	 */
+    /**
+     * @param Media $media
+     * @return bool
+     */
     public function remove(Media $media)
     {
         $this->em->remove($media);
@@ -157,9 +157,9 @@ 
         return true;
     }
 
-	/**
-	 * @param Mediable $model
-	 */
+    /**
+     * @param Mediable $model
+     */
     public function removeAllMediasForModel( Mediable $model )
     {
         $model_name = Reflection::getClassShortName($model);

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/
     */

Indentation +18 added lines, -18 removed lines

@@ -227,18 +227,18 @@ 
     }
 
     /**
-    * Tests a string as to whether it's valid UTF-8 and supported by the
-    * Unicode standard
-    * Note: this function has been modified to simple return true or false
-    * @author <hsivonen@iki.fi>
-    * @param string UTF-8 encoded string
-    * @return boolean true if valid
-    * @see http://hsivonen.iki.fi/php-utf8/
-    */
+     * Tests a string as to whether it's valid UTF-8 and supported by the
+     * Unicode standard
+     * Note: this function has been modified to simple return true or false
+     * @author <hsivonen@iki.fi>
+     * @param string UTF-8 encoded string
+     * @return boolean true if valid
+     * @see http://hsivonen.iki.fi/php-utf8/
+     */
     public static function validUtf8($str)
     {
         $mState = 0;     // cached expected number of octets after the current octet
-                         // until the beginning of the next UTF8 character sequence
+                            // until the beginning of the next UTF8 character sequence
         $mUcs4  = 0;     // cached Unicode character
         $mBytes = 1;     // cached expected number of octets in the current sequence
 
@@ -304,9 +304,9 @@ 
                     $tmp = ($tmp & 0x0000003F) << $shift;
                     $mUcs4 |= $tmp;
                     /**
-                    * End of the multi-octet sequence. mUcs4 now contains the final
-                    * Unicode codepoint to be output
-                    */
+                     * End of the multi-octet sequence. mUcs4 now contains the final
+                     * Unicode codepoint to be output
+                     */
                     if (0 == --$mState) {
                         /*
                         * Check for illegal sequences and codepoints.
@@ -330,9 +330,9 @@ 
                     }
                 } else {
                     /**
-                    *((0xC0 & (*in) != 0x80) && (mState != 0))
-                    * Incomplete multi-octet sequence.
-                    */
+                     *((0xC0 & (*in) != 0x80) && (mState != 0))
+                     * Incomplete multi-octet sequence.
+                     */
                     return false;
                 }
             }
@@ -360,9 +360,9 @@ 
 
         // More stripping. Replace spaces with dashes
         $text = strtolower(preg_replace('/[^A-Z^a-z^0-9^\/]+/', $separator,
-                           preg_replace('/([a-z\d])([A-Z])/', '\1_\2',
-                           preg_replace('/([A-Z]+)([A-Z][a-z])/', '\1_\2',
-                           preg_replace('/::/', '/', $text)))));
+                            preg_replace('/([a-z\d])([A-Z])/', '\1_\2',
+                            preg_replace('/([A-Z]+)([A-Z][a-z])/', '\1_\2',
+                            preg_replace('/::/', '/', $text)))));
 
         return trim($text, $separator);
     }

Spacing +17 added lines, -17 removed lines

@@ -40,13 +40,13 @@ 
         $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
+            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 ?
+            for ($j = 0; $j < $n; $j++) { # n bytes matching 10bbbbbb follow ?
                 if ((++$i == strlen($string)) || ((ord($string[$i]) & 0xC0) != 0x80))
                 return false;
             }
@@ -123,7 +123,7 @@ 
             chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
             chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
             chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-            chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+            chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
             chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
             chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
             chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -139,7 +139,7 @@ 
             chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
             chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
             chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-            chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
+            chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
             chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
             chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
             chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
@@ -169,11 +169,11 @@ 
             'Ä' => 'Ae', 'ä' => 'ae', 'Ü' => 'Ue', 'ü' => 'ue',
             'Ö' => 'Oe', 'ö' => 'oe', 'ß' => 'ss',
             // Norwegian characters
-            'Å'=>'Aa','Æ'=>'Ae','Ø'=>'O','æ'=>'a','ø'=>'o','å'=>'aa'
+            'Å'=>'Aa', 'Æ'=>'Ae', 'Ø'=>'O', 'æ'=>'a', 'ø'=>'o', 'å'=>'aa'
             );
 
             $string = strtr($string, $chars);
-        } else {
+        }else {
             // Assume ISO-8859-1 if not UTF-8
             $chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
             .chr(159).chr(162).chr(165).chr(181).chr(192).chr(193).chr(194)
@@ -237,10 +237,10 @@ 
     */
     public static function validUtf8($str)
     {
-        $mState = 0;     // cached expected number of octets after the current octet
+        $mState = 0; // cached expected number of octets after the current octet
                          // until the beginning of the next UTF8 character sequence
-        $mUcs4  = 0;     // cached Unicode character
-        $mBytes = 1;     // cached expected number of octets in the current sequence
+        $mUcs4  = 0; // cached Unicode character
+        $mBytes = 1; // cached expected number of octets in the current sequence
 
         $len = strlen($str);
         for ($i = 0; $i < $len; $i++) {
@@ -288,13 +288,13 @@ 
                     $mUcs4 = ($mUcs4 & 1) << 30;
                     $mState = 5;
                     $mBytes = 6;
-                } else {
+                }else {
                     /* Current octet is neither in the US-ASCII range nor a legal first
                      * octet of a multi-octet sequence.
                      */
                     return false;
                 }
-            } else {
+            }else {
                 // When mState is non-zero, we expect a continuation of the multi-octet
                 // sequence
                 if (0x80 == (0xC0 & ($in))) {
@@ -328,7 +328,7 @@ 
                         $mUcs4  = 0;
                         $mBytes = 1;
                     }
-                } else {
+                }else {
                     /**
                     *((0xC0 & (*in) != 0x80) && (mState != 0))
                     * Incomplete multi-octet sequence.
@@ -351,7 +351,7 @@ 
     {
         if (function_exists('mb_strtolower')) {
             $text = mb_strtolower($text);
-        } else {
+        }else {
             $text = strtolower($text);
         }
 

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;
     }

Event/UploadEvent.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Rafidion Michael
- * Date: 30/11/2014
- * Time: 18:21
- */
+     * Created by PhpStorm.
+     * User: Rafidion Michael
+     * Date: 30/11/2014
+     * Time: 18:21
+     */
 
 namespace Mykees\MediaBundle\Event;
 

Form/Type/MediaShowType.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Rafidion Michael
- * Date: 18/11/2014
- * Time: 01:22
- */
+     * Created by PhpStorm.
+     * User: Rafidion Michael
+     * Date: 18/11/2014
+     * Time: 01:22
+     */
 
 namespace Mykees\MediaBundle\Form\Type;
 

Spacing +2 added lines, -2 removed lines

@@ -21,10 +21,10 @@
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name','text',[
+            ->add('name', 'text', [
                 "label"=>"Nom de l'image"
             ])
-            ->add('file','text',[
+            ->add('file', 'text', [
                 "label"=>"Chemin de l'image"
             ])
         ;

Form/Type/MediaType.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('fileData','file')
+            ->add('fileData', 'file')
         ;
     }
     

Helper/ResizeHelper.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: tetsu0o
- * Date: 29/12/14
- * Time: 02:03
- */
+     * Created by PhpStorm.
+     * User: tetsu0o
+     * Date: 29/12/14
+     * Time: 02:03
+     */
 
 namespace Mykees\MediaBundle\Helper;
 

Spacing +3 added lines, -3 removed lines

@@ -26,9 +26,9 @@ 
 
     public function resize($image)
     {
-        $absolute_path = $this->webroot . $image;
+        $absolute_path = $this->webroot.$image;
         $absolute_info = pathinfo($absolute_path);
-        $allowedExtension = ['jpg','JPG','jpeg',"JPEG",'png','PNG','gif','GIF'];
+        $allowedExtension = ['jpg', 'JPG', 'jpeg', "JPEG", 'png', 'PNG', 'gif', 'GIF'];
         $extension = pathinfo($image);
         $extension = $extension['extension'];
 
@@ -46,7 +46,7 @@ 
                     $imagine = new \Imagine\Gd\Imagine();
                     $mode = $this->options['mode'];
 
-                    $imagine->open($absolute_info['dirname'] . '/' . $absolute_info['filename'] . '.'.$extension)
+                    $imagine->open($absolute_info['dirname'].'/'.$absolute_info['filename'].'.'.$extension)
                         ->thumbnail(
                             new \Imagine\Image\Box($width, $height),
                             !empty($mode) &&

Repository/MediaRepository.php

Spacing +9 added lines, -9 removed lines

@@ -23,11 +23,11 @@ 
     {
         $query = $this->_em->createQueryBuilder()
             ->select('m')
-            ->from($this->_entityName,'m')
+            ->from($this->_entityName, 'm')
             ->where('m.model = :model')
             ->andWhere('m.modelId = :modelId')
-            ->setParameter('model',$model)
-            ->setParameter('modelId',$model_id)
+            ->setParameter('model', $model)
+            ->setParameter('modelId', $model_id)
             ->getQuery()
         ;
         return $query;
@@ -42,9 +42,9 @@ 
     {
         $query = $this->_em->createQueryBuilder()
             ->select('m')
-            ->from($this->_entityName,'m')
+            ->from($this->_entityName, 'm')
             ->where('m.model = :model')
-            ->setParameter('model',$model)
+            ->setParameter('model', $model)
             ->getQuery()
         ;
         return $query;
@@ -59,11 +59,11 @@ 
     {
         $query = $this->_em->createQueryBuilder()
             ->select('m')
-            ->from($this->_entityName,'m')
+            ->from($this->_entityName, 'm')
             ->where('m.model IN(:model)')
             ->andWhere('m.modelId IN(:modelId)')
-            ->setParameter('model',array_values($model_info['models']))
-            ->setParameter('modelId',array_values($model_info['ids']))
+            ->setParameter('model', array_values($model_info['models']))
+            ->setParameter('modelId', array_values($model_info['ids']))
             ->getQuery()
         ;
         return $query;
@@ -74,7 +74,7 @@ 
      * @param array $model_info
      * @return array
      */
-    public function findForArrayModels(array $model_info){
+    public function findForArrayModels(array $model_info) {
         return $this->queryForArray($model_info)
                     ->getResult();
     }

Twig/Extension/ImageResizeExtension.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: tetsu0o
- * Date: 30/12/14
- * Time: 02:47
- */
+     * Created by PhpStorm.
+     * User: tetsu0o
+     * Date: 30/12/14
+     * Time: 02:47
+     */
 
 namespace Mykees\MediaBundle\Twig\Extension;
 

Spacing +8 added lines, -8 removed lines

@@ -27,12 +27,12 @@ 
         ];
     }
 
-    public function getImage($image, $width, $height, $options=[])
+    public function getImage($image, $width, $height, $options = [])
     {
         $attr = false;
-        foreach($options as $k=>$opt)
+        foreach ($options as $k=>$opt)
         {
-            if( $k > 1 ){
+            if ($k > 1) {
                 $attr .= ' ';
             }
             $attr .= $k.'="'.$opt.'"';
@@ -40,13 +40,13 @@ 
 
         $webroot = $this->rootDir.'/../web/';
         $info = pathinfo($image);
-        $imageResize = $info['dirname'] . '/' . $info['filename'] . "_$width" . "x$height" . '.jpg';
-        $fullPathImageResize = $webroot . $imageResize;
+        $imageResize = $info['dirname'].'/'.$info['filename']."_$width"."x$height".'.jpg';
+        $fullPathImageResize = $webroot.$imageResize;
 
-        if(file_exists($fullPathImageResize))
+        if (file_exists($fullPathImageResize))
         {
-            return '<img src="'. $imageResize .'" '. $attr .'>';
-        } else {
+            return '<img src="'.$imageResize.'" '.$attr.'>';
+        }else {
             return false;
         }