Merge pull request #2 from overtrue/analysis-qvyexx

overtrue · web-flow · commit 7876be068a7f · 2016-08-31T11:56:41.000+08:00
Applied fixes from StyleCI
diff --git a/src/LocalStorage.php b/src/LocalStorage.php
@@ -26,9 +26,9 @@ class LocalStorage implements StorageInterface
      * @param \Symfony\Component\HttpFoundation\File\UploadedFile $file
      * @param string                                              $filename
      *
-     * @return mixed
-     *
      * @throws \Overtrue\LaravelUEditor\StoreErrorException
+     *
+     * @return mixed
      */
     public function store(UploadedFile $file, $filename)
     {
@@ -73,7 +73,7 @@ public function lists($path, $start, $size = 20, array $allowFiles = [])
 
         foreach ($filesIterator as $file) {
             $files[] = [
-                'url' => asset($path.'/'.$file->getRelativePathname()),
+                'url'   => asset($path.'/'.$file->getRelativePathname()),
                 'mtime' => $file->getMTime(),
             ];
         }
diff --git a/src/StorageManager.php b/src/StorageManager.php
@@ -44,12 +44,12 @@ public function upload(Request $request)
         $filename = $this->getFilename($file, $config);
 
         $response = [
-            'state' => 'SUCCESS',
-            'url' => $this->getUrl($filename),
-            'title' => $filename,
+            'state'    => 'SUCCESS',
+            'url'      => $this->getUrl($filename),
+            'title'    => $filename,
             'original' => $file->getClientOriginalName(),
-            'type' => $file->getExtension(),
-            'size' => $file->getSize(),
+            'type'     => $file->getExtension(),
+            'size'     => $file->getSize(),
         ];
 
         try {
@@ -77,7 +77,7 @@ public function listFiles($path, $start, $size = 20, array $allowFiles = [])
 
         return [
             'state' => empty($files) ? 'no match file' : 'SUCCESS',
-            'list' => $files,
+            'list'  => $files,
             'start' => $start,
             'total' => count($files),
         ];
@@ -173,9 +173,9 @@ public function getUploadConfig($action)
         foreach ($prefixes as $prefix) {
             if ($action == $upload[$prefix.'ActionName']) {
                 $config = [
-                    'action' => array_get($upload, $prefix.'ActionName'),
-                    'field_name' => array_get($upload, $prefix.'FieldName'),
-                    'max_size' => array_get($upload, $prefix.'MaxSize'),
+                    'action'      => array_get($upload, $prefix.'ActionName'),
+                    'field_name'  => array_get($upload, $prefix.'FieldName'),
+                    'max_size'    => array_get($upload, $prefix.'MaxSize'),
                     'allow_files' => array_get($upload, $prefix.'AllowFiles', []),
                     'path_format' => array_get($upload, $prefix.'PathFormat'),
                 ];
@@ -209,7 +209,7 @@ public function formatPath($path)
     {
         $time = time();
         $partials = explode('-', date('Y-y-m-d-H-i-s'));
-        $replacement = ['{yyyy}','{yy}', '{mm}', '{dd}', '{hh}', '{ii}', '{ss}'];
+        $replacement = ['{yyyy}', '{yy}', '{mm}', '{dd}', '{hh}', '{ii}', '{ss}'];
         $path = str_replace($replacement, $partials, $path);
         $path = str_replace('{time}', $time, $path);
 
diff --git a/src/UEditorServiceProvider.php b/src/UEditorServiceProvider.php
@@ -38,7 +38,7 @@ public function boot(Router $router)
         ], 'assets');
 
         $this->publishes([
-            __DIR__.'/views' => base_path('resources/views/vendor/ueditor'),
+            __DIR__.'/views'        => base_path('resources/views/vendor/ueditor'),
             __DIR__.'/translations' => base_path('resources/lang/vendor/ueditor'),
         ], 'resources');
 
diff --git a/src/assets/ueditor/php/Uploader.class.php b/src/assets/ueditor/php/Uploader.class.php
@@ -20,29 +20,29 @@ class Uploader
     private $fileSize; //文件大小
     private $fileType; //文件类型
     private $stateInfo; //上传状态信息,
-    private $stateMap = array( //上传状态映射表，国际化用户需考虑此处数据的国际化
+    private $stateMap = [ //上传状态映射表，国际化用户需考虑此处数据的国际化
         'SUCCESS', //上传成功标记，在UEditor中内不可改变，否则flash判断会出错
         '文件大小超出 upload_max_filesize 限制',
         '文件大小超出 MAX_FILE_SIZE 限制',
         '文件未被完整上传',
         '没有文件被上传',
         '上传文件为空',
-        'ERROR_TMP_FILE' => '临时文件错误',
+        'ERROR_TMP_FILE'           => '临时文件错误',
         'ERROR_TMP_FILE_NOT_FOUND' => '找不到临时文件',
-        'ERROR_SIZE_EXCEED' => '文件大小超出网站限制',
-        'ERROR_TYPE_NOT_ALLOWED' => '文件类型不允许',
-        'ERROR_CREATE_DIR' => '目录创建失败',
-        'ERROR_DIR_NOT_WRITEABLE' => '目录没有写权限',
-        'ERROR_FILE_MOVE' => '文件保存时出错',
-        'ERROR_FILE_NOT_FOUND' => '找不到上传文件',
-        'ERROR_WRITE_CONTENT' => '写入文件内容错误',
-        'ERROR_UNKNOWN' => '未知错误',
-        'ERROR_DEAD_LINK' => '链接不可用',
-        'ERROR_HTTP_LINK' => '链接不是http链接',
-        'ERROR_HTTP_CONTENTTYPE' => '链接contentType不正确',
-        'INVALID_URL' => '非法 URL',
-        'INVALID_IP' => '非法 IP',
-    );
+        'ERROR_SIZE_EXCEED'        => '文件大小超出网站限制',
+        'ERROR_TYPE_NOT_ALLOWED'   => '文件类型不允许',
+        'ERROR_CREATE_DIR'         => '目录创建失败',
+        'ERROR_DIR_NOT_WRITEABLE'  => '目录没有写权限',
+        'ERROR_FILE_MOVE'          => '文件保存时出错',
+        'ERROR_FILE_NOT_FOUND'     => '找不到上传文件',
+        'ERROR_WRITE_CONTENT'      => '写入文件内容错误',
+        'ERROR_UNKNOWN'            => '未知错误',
+        'ERROR_DEAD_LINK'          => '链接不可用',
+        'ERROR_HTTP_LINK'          => '链接不是http链接',
+        'ERROR_HTTP_CONTENTTYPE'   => '链接contentType不正确',
+        'INVALID_URL'              => '非法 URL',
+        'INVALID_IP'               => '非法 IP',
+    ];
 
     /**
      * 构造函数.
@@ -121,7 +121,7 @@ private function upFile()
             $this->stateInfo = $this->getStateInfo('ERROR_CREATE_DIR');
 
             return;
-        } elseif (!is_writeable($dirname)) {
+        } elseif (!is_writable($dirname)) {
             $this->stateInfo = $this->getStateInfo('ERROR_DIR_NOT_WRITEABLE');
 
             return;
@@ -165,7 +165,7 @@ private function upBase64()
             $this->stateInfo = $this->getStateInfo('ERROR_CREATE_DIR');
 
             return;
-        } elseif (!is_writeable($dirname)) {
+        } elseif (!is_writable($dirname)) {
             $this->stateInfo = $this->getStateInfo('ERROR_DIR_NOT_WRITEABLE');
 
             return;
@@ -236,9 +236,9 @@ private function saveRemote()
         //打开输出缓冲区并获取远程图片
         ob_start();
         $context = stream_context_create(
-            array('http' => array(
+            ['http' => [
                 'follow_location' => false, // don't follow redirects
-            ))
+            ]]
         );
         readfile($imgUrl, false, $context);
         $img = ob_get_contents();
@@ -265,7 +265,7 @@ private function saveRemote()
             $this->stateInfo = $this->getStateInfo('ERROR_CREATE_DIR');
 
             return;
-        } elseif (!is_writeable($dirname)) {
+        } elseif (!is_writable($dirname)) {
             $this->stateInfo = $this->getStateInfo('ERROR_DIR_NOT_WRITEABLE');
 
             return;
@@ -391,13 +391,13 @@ private function checkSize()
      */
     public function getFileInfo()
     {
-        return array(
-            'state' => $this->stateInfo,
-            'url' => $this->fullName,
-            'title' => $this->fileName,
+        return [
+            'state'    => $this->stateInfo,
+            'url'      => $this->fullName,
+            'title'    => $this->fileName,
             'original' => $this->oriName,
-            'type' => $this->fileType,
-            'size' => $this->fileSize,
-        );
+            'type'     => $this->fileType,
+            'size'     => $this->fileSize,
+        ];
     }
 }
diff --git a/src/assets/ueditor/php/action_crawler.php b/src/assets/ueditor/php/action_crawler.php
@@ -9,16 +9,16 @@
 include 'Uploader.class.php';
 
 /* 上传配置 */
-$config = array(
+$config = [
     'pathFormat' => $CONFIG['catcherPathFormat'],
-    'maxSize' => $CONFIG['catcherMaxSize'],
+    'maxSize'    => $CONFIG['catcherMaxSize'],
     'allowFiles' => $CONFIG['catcherAllowFiles'],
-    'oriName' => 'remote.png',
-);
+    'oriName'    => 'remote.png',
+];
 $fieldName = $CONFIG['catcherFieldName'];
 
 /* 抓取远程图片 */
-$list = array();
+$list = [];
 if (isset($_POST[$fieldName])) {
     $source = $_POST[$fieldName];
 } else {
@@ -27,18 +27,18 @@
 foreach ($source as $imgUrl) {
     $item = new Uploader($imgUrl, $config, 'remote');
     $info = $item->getFileInfo();
-    array_push($list, array(
-        'state' => $info['state'],
-        'url' => $info['url'],
-        'size' => $info['size'],
-        'title' => htmlspecialchars($info['title']),
+    array_push($list, [
+        'state'    => $info['state'],
+        'url'      => $info['url'],
+        'size'     => $info['size'],
+        'title'    => htmlspecialchars($info['title']),
         'original' => htmlspecialchars($info['original']),
-        'source' => htmlspecialchars($imgUrl),
-    ));
+        'source'   => htmlspecialchars($imgUrl),
+    ]);
 }
 
 /* 返回抓取数据 */
-return json_encode(array(
+return json_encode([
     'state' => count($list) ? 'SUCCESS' : 'ERROR',
-    'list' => $list,
-));
+    'list'  => $list,
+]);
diff --git a/src/assets/ueditor/php/action_list.php b/src/assets/ueditor/php/action_list.php
@@ -33,17 +33,17 @@
 $path = $_SERVER['DOCUMENT_ROOT'].(substr($path, 0, 1) == '/' ? '' : '/').$path;
 $files = getfiles($path, $allowFiles);
 if (!count($files)) {
-    return json_encode(array(
+    return json_encode([
         'state' => 'no match file',
-        'list' => array(),
+        'list'  => [],
         'start' => $start,
         'total' => count($files),
-    ));
+    ]);
 }
 
 /* 获取指定范围的列表 */
 $len = count($files);
-for ($i = min($end, $len) - 1, $list = array(); $i < $len && $i >= 0 && $i >= $start; --$i) {
+for ($i = min($end, $len) - 1, $list = []; $i < $len && $i >= 0 && $i >= $start; --$i) {
     $list[] = $files[$i];
 }
 //倒序
@@ -52,12 +52,12 @@
 //}
 
 /* 返回数据 */
-$result = json_encode(array(
+$result = json_encode([
     'state' => 'SUCCESS',
-    'list' => $list,
+    'list'  => $list,
     'start' => $start,
     'total' => count($files),
-));
+]);
 
 return $result;
 
@@ -69,7 +69,7 @@
  *
  * @return array
  */
-function getfiles($path, $allowFiles, &$files = array())
+function getfiles($path, $allowFiles, &$files = [])
 {
     if (!is_dir($path)) {
         return;
@@ -85,10 +85,10 @@ function getfiles($path, $allowFiles, &$files = array())
                 getfiles($path2, $allowFiles, $files);
             } else {
                 if (preg_match("/\.(".$allowFiles.')$/i', $file)) {
-                    $files[] = array(
-                        'url' => substr($path2, strlen($_SERVER['DOCUMENT_ROOT'])),
+                    $files[] = [
+                        'url'   => substr($path2, strlen($_SERVER['DOCUMENT_ROOT'])),
                         'mtime' => filemtime($path2),
-                    );
+                    ];
                 }
             }
         }
diff --git a/src/assets/ueditor/php/action_upload.php b/src/assets/ueditor/php/action_upload.php
@@ -11,38 +11,38 @@
 $base64 = 'upload';
 switch (htmlspecialchars($_GET['action'])) {
     case 'uploadimage':
-        $config = array(
+        $config = [
             'pathFormat' => $CONFIG['imagePathFormat'],
-            'maxSize' => $CONFIG['imageMaxSize'],
+            'maxSize'    => $CONFIG['imageMaxSize'],
             'allowFiles' => $CONFIG['imageAllowFiles'],
-        );
+        ];
         $fieldName = $CONFIG['imageFieldName'];
         break;
     case 'uploadscrawl':
-        $config = array(
+        $config = [
             'pathFormat' => $CONFIG['scrawlPathFormat'],
-            'maxSize' => $CONFIG['scrawlMaxSize'],
+            'maxSize'    => $CONFIG['scrawlMaxSize'],
             'allowFiles' => $CONFIG['scrawlAllowFiles'],
-            'oriName' => 'scrawl.png',
-        );
+            'oriName'    => 'scrawl.png',
+        ];
         $fieldName = $CONFIG['scrawlFieldName'];
         $base64 = 'base64';
         break;
     case 'uploadvideo':
-        $config = array(
+        $config = [
             'pathFormat' => $CONFIG['videoPathFormat'],
-            'maxSize' => $CONFIG['videoMaxSize'],
+            'maxSize'    => $CONFIG['videoMaxSize'],
             'allowFiles' => $CONFIG['videoAllowFiles'],
-        );
+        ];
         $fieldName = $CONFIG['videoFieldName'];
         break;
     case 'uploadfile':
     default:
-        $config = array(
+        $config = [
             'pathFormat' => $CONFIG['filePathFormat'],
-            'maxSize' => $CONFIG['fileMaxSize'],
+            'maxSize'    => $CONFIG['fileMaxSize'],
             'allowFiles' => $CONFIG['fileAllowFiles'],
-        );
+        ];
         $fieldName = $CONFIG['fileFieldName'];
         break;
 }
diff --git a/src/assets/ueditor/php/controller.php b/src/assets/ueditor/php/controller.php
@@ -1,4 +1,5 @@
 <?php
+
 //header('Access-Control-Allow-Origin: http://www.baidu.com'); //设置http://www.baidu.com允许跨域访问
 //header('Access-Control-Allow-Headers: X-Requested-With,X_Requested_With'); //设置允许的跨域header
 date_default_timezone_set('Asia/chongqing');
@@ -39,9 +40,9 @@
         break;
 
     default:
-        $result = json_encode(array(
+        $result = json_encode([
             'state' => '请求地址出错',
-        ));
+        ]);
         break;
 }
 
@@ -50,9 +51,9 @@
     if (preg_match("/^[\w_]+$/", $_GET['callback'])) {
         echo htmlspecialchars($_GET['callback']).'('.$result.')';
     } else {
-        echo json_encode(array(
+        echo json_encode([
             'state' => 'callback参数不合法',
-        ));
+        ]);
     }
 } else {
     echo $result;
diff --git a/src/config/ueditor.php b/src/config/ueditor.php
diff --git a/src/translations/en/upload.php b/src/translations/en/upload.php
diff --git a/src/translations/zh-CN/upload.php b/src/translations/zh-CN/upload.php
diff --git a/src/translations/zh-TW/upload.php b/src/translations/zh-TW/upload.php

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ class LocalStorage implements StorageInterface`
`26`	`26`	`* @param \Symfony\Component\HttpFoundation\File\UploadedFile $file`
`27`	`27`	`* @param string $filename`
`28`	`28`	`*`
`29`		`- * @return mixed`
`30`		`- *`
`31`	`29`	`* @throws \Overtrue\LaravelUEditor\StoreErrorException`
	`30`	`+ *`
	`31`	`+ * @return mixed`
`32`	`32`	`*/`
`33`	`33`	`public function store(UploadedFile $file, $filename)`
`34`	`34`	`{`
`@@ -73,7 +73,7 @@ public function lists($path, $start, $size = 20, array $allowFiles = [])`
`73`	`73`
`74`	`74`	`foreach ($filesIterator as $file) {`
`75`	`75`	`$files[] = [`
`76`		`- 'url' => asset($path.'/'.$file->getRelativePathname()),`
	`76`	`+ 'url' => asset($path.'/'.$file->getRelativePathname()),`
`77`	`77`	`'mtime' => $file->getMTime(),`
`78`	`78`	`];`
`79`	`79`	`}`