Schlaefer / Saito

plugins/BbcodeParser/src/Lib/jBBCode/Definitions/JbbCodeDefinitions.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Plugin\BbcodeParser\src\Lib\jBBCode\Definitions;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
 use Plugin\BbcodeParser\src\Lib\Helper\Message;
 use Plugin\BbcodeParser\src\Lib\Helper\UrlParserTrait;
 use Saito\DomainParser;

Spacing +16 added lines, -16 removed lines

@@ -71,7 +71,7 @@ 
             return $this->Html->link($url, $url, ['target' => '_blank']);
         }
 
-        $loader = function () use ($url) {
+        $loader = function() use ($url) {
             $embed = ['url' => $url];
 
             try {
@@ -107,7 +107,7 @@ 
 
         $callable = \Closure::fromCallable($loader);
 
-        $uid = 'embed-' . md5($url);
+        $uid = 'embed-'.md5($url);
         $info = Cache::remember($uid, $callable, 'bbcodeParserEmbed');
 
         return $this->_sHelper->Html->div('js-embed', '', ['id' => $uid, 'data-embed' => json_encode($info)]);
@@ -186,7 +186,7 @@ 
         }
 
         $ad = explode('|', $this->_sOptions->get('video_domains_allowed'));
-        $trim = function ($v) {
+        $trim = function($v) {
             return trim($v);
         };
         $this->_allowedVideoDomains = array_fill_keys(array_map($trim, $ad), 1);
@@ -271,9 +271,9 @@ 
             }
         }
 
-        $out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="' . $width . '" height="' . $height . '">
-									<param name="movie" value="' . $url . '"></param>
-									<embed src="' . $url . '" width="' . $width . '" height="' . $height . '" type="application/x-shockwave-flash" wmode="opaque" style="width:' . $width . 'px; height:' . $height . 'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
+        $out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="'.$width.'" height="'.$height.'">
+									<param name="movie" value="' . $url.'"></param>
+									<embed src="' . $url.'" width="'.$width.'" height="'.$height.'" type="application/x-shockwave-flash" wmode="opaque" style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
 
         return $out;
     }
@@ -393,12 +393,12 @@ 
     {
         $listPieces = explode('[*]', $content);
         unset($listPieces[0]);
-        $listPieceProcessor = function ($li) {
-            return '<li>' . $li . '</li>' . "\n";
+        $listPieceProcessor = function($li) {
+            return '<li>'.$li.'</li>'."\n";
         };
         $listPieces = array_map($listPieceProcessor, $listPieces);
 
-        return '<ul>' . implode('', $listPieces) . '</ul>';
+        return '<ul>'.implode('', $listPieces).'</ul>';
     }
 }
 
@@ -420,14 +420,14 @@ 
         }
 
         $title = $this->_mbStrpad(
-            ' ' . __('Spoiler') . ' ',
+            ' '.__('Spoiler').' ',
             $length,
             '▇',
             STR_PAD_BOTH
         );
 
         $json = json_encode(['string' => $content]);
-        $id = 'spoiler_' . rand(0, 9999999999999);
+        $id = 'spoiler_'.rand(0, 9999999999999);
 
         $out = <<<EOF
 <div class="richtext-spoiler" style="display: inline;">
@@ -475,18 +475,18 @@ 
         $result = null;
         $repeat = ceil($strLen - $padStrLen + $padLen);
         if ($dir == STR_PAD_RIGHT) {
-            $result = $str . str_repeat($padStr, $repeat);
+            $result = $str.str_repeat($padStr, $repeat);
             $result = mb_substr($result, 0, $padLen);
         } else {
             if ($dir == STR_PAD_LEFT) {
-                $result = str_repeat($padStr, $repeat) . $str;
+                $result = str_repeat($padStr, $repeat).$str;
                 $result = mb_substr($result, -$padLen);
             } else {
                 if ($dir == STR_PAD_BOTH) {
                     $length = ($padLen - $strLen) / 2;
                     $repeat = ceil($length / $padStrLen);
-                    $result = mb_substr(str_repeat($padStr, $repeat), 0, floor($length)) .
-                        $str .
+                    $result = mb_substr(str_repeat($padStr, $repeat), 0, floor($length)).
+                        $str.
                         mb_substr(str_repeat($padStr, $repeat), 0, ceil($length));
                 }
             }
@@ -517,7 +517,7 @@ 
             $attributes['img'] = $attributes['width'];
         }
         if (!empty($attributes['height'])) {
-            $attributes['img'] .= 'x' . $attributes['height'];
+            $attributes['img'] .= 'x'.$attributes['height'];
         }
 
         return parent::_parse($content, $attributes, $node);

plugins/ImageUploader/tests/TestCase/Controller/UploadsControllerTest.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -45,7 +45,7 @@ 
     {
         parent::setUp();
 
-        $this->file = new File(TMP . 'my new-upload.png');
+        $this->file = new File(TMP.'my new-upload.png');
         $this->mockMediaFile($this->file);
     }
 
@@ -72,7 +72,7 @@ 
         $this->loginJwt(1);
 
         $this->upload($this->file);
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
 
@@ -114,12 +114,12 @@ 
     {
         $this->loginJwt(1);
 
-        $this->file = new File(TMP . 'tmp_svg.svg');
+        $this->file = new File(TMP.'tmp_svg.svg');
         $this->file->write('<?xml version="1.0" encoding="UTF-8" ?>
             <svg width="9" height="9" style="background:red;"></svg>');
         $this->upload($this->file);
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
 
@@ -159,12 +159,12 @@ 
     {
         $this->loginJwt(1);
         unset($this->file);
-        $this->file = new File(TMP . 'tmp_exif.jpg');
+        $this->file = new File(TMP.'tmp_exif.jpg');
 
-        $fixture = new File($path = Plugin::path('ImageUploader') . 'tests/Fixture/exif-with-location.jpg');
+        $fixture = new File($path = Plugin::path('ImageUploader').'tests/Fixture/exif-with-location.jpg');
         $fixture->copy($this->file->path);
 
-        $readExif = function (File $file) {
+        $readExif = function(File $file) {
             //@codingStandardsIgnoreStart
             return @exif_read_data($file->path);
             //@codingStandardsIgnoreEnd
@@ -176,7 +176,7 @@ 
 
         $this->upload($this->file);
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
 
@@ -236,7 +236,7 @@ 
 
         $this->get('api/v2/uploads');
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
 
@@ -283,7 +283,7 @@ 
 
         $this->delete('api/v2/uploads/1');
 
-        $response = json_decode((string)$this->_response->getBody(), true);
+        $response = json_decode((string) $this->_response->getBody(), true);
 
         $this->assertResponseCode(204);
 
@@ -311,7 +311,7 @@ 
                 0 => [
                     'file' => [
                         'tmp_name' => $file->path,
-                        'name' => $file->name() . '.' . $this->file->ext(),
+                        'name' => $file->name().'.'.$this->file->ext(),
                         'size' => $file->size(),
                         'type' => $file->mime(),
                     ]

plugins/ImageUploader/tests/TestCase/Controller/ThumbnailControllerTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -33,7 +33,7 @@ 
         $Uploads = TableRegistry::get('ImageUploader.Uploads');
         $upload = $Uploads->get(1);
 
-        $file = new File(Configure::read('Saito.Settings.uploadDirectory') . $upload->get('name'));
+        $file = new File(Configure::read('Saito.Settings.uploadDirectory').$upload->get('name'));
         $raw = (new SimpleImage())
             ->fromNew(500, 500, 'blue')
             ->toString($upload->get('type'));
@@ -47,7 +47,7 @@ 
 
         $this->assertFalse(Cache::read($upload->get('id'), $cacheKey));
 
-        $this->get('/api/v2/uploads/thumb/1?h=' . $upload->get('hash'));
+        $this->get('/api/v2/uploads/thumb/1?h='.$upload->get('hash'));
 
         $cache = Cache::read($upload->get('id'), $cacheKey);
 
@@ -55,7 +55,7 @@ 
         $this->assertSame(300, imagesx($image));
         $this->assertSame(300, imagesy($image));
         $this->assertSame($upload->get('type'), $cache['type']);
-        $this->assertResponseEquals($cache['raw'], (string)$this->_response->getBody());
+        $this->assertResponseEquals($cache['raw'], (string) $this->_response->getBody());
         $this->assertHeader('content-type', 'image/png');
 
         //// cleanup
@@ -74,7 +74,7 @@ 
         $Uploads = TableRegistry::get('ImageUploader.Uploads');
         $upload = $Uploads->get(1);
 
-        $file = new File(Configure::read('Saito.Settings.uploadDirectory') . $upload->get('name'));
+        $file = new File(Configure::read('Saito.Settings.uploadDirectory').$upload->get('name'));
         $raw = (new SimpleImage())
             ->fromNew(100, 100, 'blue')
             ->toString($upload->get('type'));

plugins/ImageUploader/src/Model/Table/UploadsTable.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -86,7 +86,7 @@ 
         $UploaderConfig = Configure::read('Saito.Settings.uploader');
         $nMax = $UploaderConfig->getMaxNumberOfUploadsPerUser();
         $rules->add(
-            function (Upload $entity, array $options) use ($nMax) {
+            function(Upload $entity, array $options) use ($nMax) {
                 $count = $this->findByUserId($entity->get('user_id'))->count();
 
                 return $count < $nMax;
@@ -192,7 +192,7 @@ 
      */
     private function convertToJpeg(File $file): File
     {
-        $jpeg = new File($file->folder()->path . DS . $file->name() . '.jpg');
+        $jpeg = new File($file->folder()->path.DS.$file->name().'.jpg');
 
         try {
             (new SimpleImage())
@@ -247,8 +247,8 @@ 
         $ratio = $size / $target;
         $ratio = sqrt($ratio);
 
-        $newwidth = (int)($width / $ratio);
-        $newheight = (int)($height / $ratio);
+        $newwidth = (int) ($width / $ratio);
+        $newheight = (int) ($height / $ratio);
         $destination = imagecreatetruecolor($newwidth, $newheight);
 
         $source = imagecreatefromstring($raw);

plugins/ImageUploader/src/Controller/ThumbnailController.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -35,8 +35,8 @@ 
      */
     public function thumb(): Response
     {
-        $id = (int)$this->request->getParam('id');
-        ['hash' => $fingerprint, 'type' => $type, 'raw' => $raw] = Cache::remember((string)$id, function () use ($id) {
+        $id = (int) $this->request->getParam('id');
+        ['hash' => $fingerprint, 'type' => $type, 'raw' => $raw] = Cache::remember((string) $id, function() use ($id) {
             $Uploads = $this->loadModel('ImageUploader.Uploads');
             $document = $Uploads->get($id);
 
@@ -55,7 +55,7 @@ 
             return compact('hash', 'raw', 'type');
         }, Configure::read('Saito.Settings.uploader')->getCacheKey());
 
-        $hash = (string)$this->request->getQuery('h');
+        $hash = (string) $this->request->getQuery('h');
         if ($hash !== $fingerprint) {
             throw new SaitoForbiddenException(
                 "Attempt to access image-thumbnail $id."

plugins/ImageUploader/src/Controller/UploadsController.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -58,10 +58,10 @@ 
         }
         $parts = explode('.', $submitted['name']);
         $ext = array_pop($parts);
-        $name = $this->CurrentUser->getId() .
-                '_' .
-                substr(Security::hash($submitted['name'], 'sha256'), 32) .
-                '.' .
+        $name = $this->CurrentUser->getId().
+                '_'.
+                substr(Security::hash($submitted['name'], 'sha256'), 32).
+                '.'.
                 $ext;
         $data = [
             'document' => $submitted,
@@ -103,7 +103,7 @@ 
             throw new GenericApiException($msg);
         }
 
-        Cache::delete((string)$imageId, 'uploadsThumbnails');
+        Cache::delete((string) $imageId, 'uploadsThumbnails');
 
         $this->autoRender = false;
         $this->response = $this->response->withStatus(204);

plugins/ImageUploader/src/View/Helper/ImageUploaderHelper.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -44,7 +44,7 @@ 
                 'title' => $image->get('title') ?: $image->get('name'),
                 'size' => $image->get('size'),
                 'url' => $this->Url->assetUrl(
-                    'useruploads/' . $image->get('name'),
+                    'useruploads/'.$image->get('name'),
                     ['fullBase' => true]
                 ),
                 'thumbnail_url' => $this->Url->build(

plugins/ImageUploader/src/Lib/UploaderConfig.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Saito - The Threaded Web Forum
@@ -63,7 +63,7 @@ 
     public function setDefaultMaxFileSize($number): self
     {
         if (is_string($number)) {
-            $number = (int)Text::parseFileSize($number, $this->defaultSize);
+            $number = (int) Text::parseFileSize($number, $this->defaultSize);
         }
         if (!is_int($number)) {
             throw new \InvalidArgumentException(
@@ -89,7 +89,7 @@ 
         if ($size === null) {
             $size = $this->defaultSize;
         } elseif (is_string($size)) {
-            $size = (int)Text::parseFileSize($size, $this->defaultSize);
+            $size = (int) Text::parseFileSize($size, $this->defaultSize);
         }
         if (!is_int($size)) {
             throw new \InvalidArgumentException(

plugins/BbcodeParser/tests/TestCase/Lib/BbcodeParserTest.php

Spacing +15 added lines, -15 removed lines

@@ -302,10 +302,10 @@ 
     {
         $input = '@Alice @Bob @Bobby Junior @Bobby Tables @Dr. No';
         $expected =
-            "<a href='/at/Alice'>@Alice</a>" .
-            " @Bob " .
-            "<a href='/at/Bobby+Junior'>@Bobby Junior</a>" .
-            " @Bobby Tables " .
+            "<a href='/at/Alice'>@Alice</a>".
+            " @Bob ".
+            "<a href='/at/Bobby+Junior'>@Bobby Junior</a>".
+            " @Bobby Tables ".
             "<a href='/at/Dr.+No'>@Dr. No</a>";
 
         $result = $this->_Parser->parse($input);
@@ -634,8 +634,8 @@ 
     public function testIframe()
     {
         //* test allowed domain
-        $input = '[iframe height=349 width=560 ' .
-            'src=http://www.youtube.com/embed/HdoW3t_WorU ' .
+        $input = '[iframe height=349 width=560 '.
+            'src=http://www.youtube.com/embed/HdoW3t_WorU '.
             'frameborder=0][/iframe]';
         $expected = [
             [
@@ -659,8 +659,8 @@ 
         $this->assertHtml($expected, $result);
 
         //* test forbidden domains
-        $input = '[iframe height=349 width=560 ' .
-            'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+        $input = '[iframe height=349 width=560 '.
+            'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
             'frameborder=0][/iframe]';
         $pattern = '/src/i';
         $result = $this->_Parser->parse(
@@ -672,8 +672,8 @@ 
 
     public function testIframeAllDomainsAllowed()
     {
-        $input = '[iframe height=349 width=560 ' .
-            'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+        $input = '[iframe height=349 width=560 '.
+            'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
             '][/iframe]';
         $expected = 'src="http://www.youtubescam.com/embed/HdoW3t_WorU';
         $this->MarkupSettings->setSingle('video_domains_allowed', '*');
@@ -683,8 +683,8 @@ 
 
     public function testIframeNoDomainAllowed()
     {
-        $input = '[iframe height=349 width=560 ' .
-            'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+        $input = '[iframe height=349 width=560 '.
+            'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
             '][/iframe]';
         $expected = '/src/i';
         $result = $this->_Parser->parse(
@@ -1029,7 +1029,7 @@ 
     {
         // [code]<citation mark>[/code] should not be cited
         $input = h(
-            "[code]\n" . $this->_Helper->getConfig('quote_symbol') . "\n[/code]"
+            "[code]\n".$this->_Helper->getConfig('quote_symbol')."\n[/code]"
         );
         $expected = '`span class=.*?richtext-citation`';
         $result = $this->_Parser->parse($input);
@@ -1046,11 +1046,11 @@ 
     public function testQuote()
     {
         $_qs = $this->MarkupSettings->get('quote_symbol');
-        $input = $_qs . ' fo [b]test[/b] ba';
+        $input = $_qs.' fo [b]test[/b] ba';
         $result = $this->_Parser->parse($input);
         $expected = [
             'span' => ['class' => 'richtext-citation'],
-            $_qs . ' fo ',
+            $_qs.' fo ',
             'strong' => [],
             'test',
             '/strong',