xpressengine / xpressengine

core/tests/User/UserGroupRepositoryTest.php

Doc Comments -1 removed lines

@@ -102,7 +102,6 @@
     /**
      * getRepository
      *
-     * @param null $model
      *
      * @return Mockery\MockInterface
      */

core/tests/User/UserRepositoryTest.php

Doc Comments -1 removed lines

@@ -102,7 +102,6 @@
     /**
      * getRepository
      *
-     * @param null $model
      *
      * @return Mockery\MockInterface
      */

core/tests/User/VirtualGroupRepositoryTest.php

Doc Comments +1 added lines, -2 removed lines

@@ -73,8 +73,8 @@ 
     /**
      * getRepository
      *
-     * @param null $model
      *
+     * @param Mockery\Mock $users
      * @return VirtualGroupRepository
      */
     protected function makeRepository($users = null, $vGroups = null, $getter = null)
@@ -114,7 +114,6 @@ 
     /**
      * getRepository
      *
-     * @param null $model
      *
      * @return Mockery\MockInterface
      */

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
     protected function makeRepository($users = null, $vGroups = null, $getter = null)
     {
 
-        $vGroups = $vGroups?:[
+        $vGroups = $vGroups ?: [
             'facebook' => [
                 'title' => 'fb_group'
             ],
@@ -91,7 +91,7 @@ 
                 'title' => 'github_group'
             ],
         ];
-        $getter = $getter?:function ($user) {
+        $getter = $getter ?: function($user) {
             $providers = [];
             if ($user->getAccountByProvider('facebook')) {
                 $providers[] = 'facebook';
@@ -105,7 +105,7 @@ 
             return $providers;
         };
 
-        $users = $users?:$this->makeUsers();
+        $users = $users ?: $this->makeUsers();
 
         return new VirtualGroupRepository($users, $vGroups, $getter);
     }

core/tests/User/UserHandlerTest.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
         $hasher = $this->getHasher();
         $hasher->shouldReceive('make')->once()->with('secret')->andReturn('encrypted');
         /** @var Mockery\MockInterface $handler */
-        $handler = $this->getHandlerMock(null,null,null,null,null,null,$hasher);
+        $handler = $this->getHandlerMock(null, null, null, null, null, null, $hasher);
         $handler->shouldReceive('validateForCreate')->withAnyArgs()->andReturn(true);
 
         $data = [
@@ -59,7 +59,7 @@ 
         $hasher = $this->getHasher();
         $hasher->shouldReceive('make')->once()->with('secret')->andReturn('encrypted');
         /** @var Mockery\MockInterface $handler */
-        $handler = $this->getHandlerMock(null,null,null,null,null,null,$hasher);
+        $handler = $this->getHandlerMock(null, null, null, null, null, null, $hasher);
         $handler->shouldReceive('validateForCreate')->withAnyArgs()->andReturn(true);
 
         $data = [
@@ -97,7 +97,7 @@ 
         $hasher = $this->getHasher();
         $hasher->shouldReceive('make')->once()->with('secret')->andReturn('encrypted');
         /** @var Mockery\MockInterface $handler */
-        $handler = $this->getHandlerMock(null,null,null,null,null,null,$hasher);
+        $handler = $this->getHandlerMock(null, null, null, null, null, null, $hasher);
         $handler->shouldReceive('validateForCreate')->withAnyArgs()->andReturn(true);
 
         $data = [
@@ -135,23 +135,23 @@ 
         $hasher = $this->getHasher();
         $hasher->shouldReceive('make')->once()->with('secret')->andReturn('encrypted');
         /** @var Mockery\MockInterface $handler */
-        $handler = $this->getHandlerMock(null,null,null,null,null,null,$hasher);
+        $handler = $this->getHandlerMock(null, null, null, null, null, null, $hasher);
         $handler->shouldReceive('validateForCreate')->withAnyArgs()->andReturn(true);
 
         $data = [
             'displayName' => 'foo',
             'password' => 'secret',
-            'groupId' => ['bar','baz']
+            'groupId' => ['bar', 'baz']
         ];
 
         /** @var Mockery\MockInterface $users */
         $users = $handler->users();
         $user = $this->makeUser();
-        $user->shouldReceive('joinGroups')->with(['bar','baz'])->andReturnSelf();
+        $user->shouldReceive('joinGroups')->with(['bar', 'baz'])->andReturnSelf();
 
         /** @var Mockery\MockInterface $groups */
         $groups = $handler->groups();
-        $groups->shouldReceive('whereIn')->once()->with('id', ['bar','baz'])->andReturnSelf();
+        $groups->shouldReceive('whereIn')->once()->with('id', ['bar', 'baz'])->andReturnSelf();
         $groups->shouldReceive('get')->once()->andReturn([]);
 
         $users->shouldReceive('create')
@@ -168,7 +168,7 @@ 
         $hasher = $this->getHasher();
         $hasher->shouldReceive('make')->once()->with('secret')->andReturn('encrypted');
         /** @var Mockery\MockInterface $handler */
-        $handler = $this->getHandlerMock(null,null,null,null,null,null,$hasher);
+        $handler = $this->getHandlerMock(null, null, null, null, null, null, $hasher);
         $handler->shouldReceive('validateForCreate')->withAnyArgs()->andReturn(true);
 
         $data = [
@@ -424,7 +424,7 @@ 
 
         /** @var Mockery\MockInterface $accounts */
         $accounts = $handler->accounts();
-        $accounts->shouldReceive('where')->once()->with(['accountId'=>'foo','provider'=>'foo'])->andReturnSelf();
+        $accounts->shouldReceive('where')->once()->with(['accountId'=>'foo', 'provider'=>'foo'])->andReturnSelf();
         $accounts->shouldReceive('first')->once()->andReturn(true);
 
 

Doc Comments +6 added lines, -1 removed lines

@@ -574,6 +574,10 @@ 
     }
 
     /**
+     * @param Mockery\MockInterface $users
+     * @param Mockery\MockInterface $groups
+     * @param Mockery\MockInterface $hasher
+     * @param Mockery\MockInterface $validator
      * @return \Xpressengine\User\UserHandler
      */
     private function getHandler(
@@ -640,7 +644,8 @@ 
     }
 
     /**
-     * @return \Xpressengine\User\UserHandler
+     * @param Mockery\MockInterface $hasher
+     * @return Mockery\Mock
      */
     private function getHandlerMock(
         $users = null,

core/tests/User/PendingEmailRepositoryTest.php

Doc Comments -1 removed lines

@@ -102,7 +102,6 @@
     /**
      * getRepository
      *
-     * @param null $model
      *
      * @return Mockery\MockInterface
      */

core/src/Xpressengine/Translation/Translator.php

Doc Comments +10 added lines, -10 removed lines

@@ -155,8 +155,8 @@ 
      * @param string $id         다국어 key
      * @param array  $parameters 인자
      * @param null   $domain     domain
-     * @param null   $locale     locale
-     * @return mixed
+     * @param string   $locale     locale
+     * @return string
      */
     public function trans($id, array $parameters = array(), $domain = null, $locale = null)
     {
@@ -201,7 +201,7 @@ 
      * @param array  $parameters 인자
      * @param null   $domain     domain
      * @param null   $locale     locale
-     * @return mixed
+     * @return string
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
@@ -219,8 +219,8 @@ 
      *
      * @param string $key     다국어 key
      * @param array  $replace 변경 데이터
-     * @param null   $locale  로케일
-     * @return mixed
+     * @param null|string   $locale  로케일
+     * @return string
      */
     public function get($key, array $replace = [], $locale = null)
     {
@@ -242,7 +242,7 @@ 
      * @param int    $number  숫자
      * @param array  $replace 변경 데이터
      * @param null   $locale  로케일
-     * @return mixed
+     * @return string
      */
     public function choice($key, $number, array $replace = [], $locale = null)
     {
@@ -255,7 +255,7 @@ 
 
     /**
      * @param string $key 다국어 key
-     * @return mixed
+     * @return string
      */
     public function getOriginalLine($key)
     {
@@ -268,7 +268,7 @@ 
      * @param string $item      아이템
      * @param string $locale    로케일
      * @param array  $replace   변경 데이터
-     * @return mixed
+     * @return string
      */
     protected function getLine($namespace, $item, $locale, array $replace)
     {
@@ -282,7 +282,7 @@ 
      *
      * @param string $line    원시 라인
      * @param array  $replace 변경 데이터
-     * @return mixed
+     * @return string
      */
     protected function makeReplacements($line, array $replace)
     {
@@ -302,7 +302,7 @@ 
      * 먼저 해석하여 정확도를 높여줍니다.
      *
      * @param array $replace 변경 데이터
-     * @return array
+     * @return Collection
      */
     protected function sortReplacements(array $replace)
     {

Spacing +5 added lines, -5 removed lines

@@ -181,7 +181,7 @@ 
             return $id;
         }
 
-        $userKeyHead = $this->userKeyPrefix . '::';
+        $userKeyHead = $this->userKeyPrefix.'::';
         if (substr($id, 0, strlen($userKeyHead)) == $userKeyHead) {
             return '';
         }
@@ -208,7 +208,7 @@ 
         $sentence = $this->choice($id, $number, $parameters, $locale);
 
         if ($sentence == $id) {
-            return $number . ' ' . $this->makeUnknownSentence($id);
+            return $number.' '.$this->makeUnknownSentence($id);
         }
 
         return $sentence;
@@ -306,7 +306,7 @@ 
      */
     protected function sortReplacements(array $replace)
     {
-        return (new Collection($replace))->sortBy(function ($value, $key) {
+        return (new Collection($replace))->sortBy(function($value, $key) {
             return mb_strlen($key) * -1;
         });
     }
@@ -361,7 +361,7 @@ 
      */
     public function getSelector()
     {
-        if (! isset($this->selector)) {
+        if (!isset($this->selector)) {
             $this->selector = new MessageSelector;
         }
 
@@ -375,7 +375,7 @@ 
      */
     public function genUserKey()
     {
-        return $this->userKeyPrefix . '::' . $this->keyGen->generate();
+        return $this->userKeyPrefix.'::'.$this->keyGen->generate();
     }
 
     /**

resources/UIObjects/Settings/SettingsPermission.php

Doc Comments +3 added lines

@@ -64,6 +64,9 @@
         }
     }
 
+    /**
+     * @param AbstractUIObject $content
+     */
     private function generateBox($title, $content)
     {
         return "<div class=\"form-group\">

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 use XeFrontend;
 use Xpressengine\Permission\Grant;
 use Xpressengine\Permission\Permission;
-use Xpressengine\Permission\PermissionHandler;
 use Xpressengine\UIObject\AbstractUIObject;
 
 class SettingsPermission extends AbstractUIObject

resources/FieldSkins/Boolean/DefaultSkin.php

Spacing +4 added lines, -4 removed lines

@@ -58,8 +58,8 @@ 
     {
         $config = $this->config;
         $boolean = '';
-        if (isset($args[$config->get('id') . 'Boolean'])) {
-            $boolean = $args[$config->get('id') . 'Boolean'];
+        if (isset($args[$config->get('id').'Boolean'])) {
+            $boolean = $args[$config->get('id').'Boolean'];
         }
 
         return View::make('dynamicField/boolean/default/edit', [
@@ -79,8 +79,8 @@ 
     {
         $config = $this->config;
         $boolean = '';
-        if (isset($args[$config->get('id') . 'Boolean'])) {
-            $boolean = $args[$config->get('id') . 'Boolean'];
+        if (isset($args[$config->get('id').'Boolean'])) {
+            $boolean = $args[$config->get('id').'Boolean'];
         }
 
         return View::make('dynamicField/boolean/default/show', [

resources/FieldSkins/Number/DefaultSkin.php

Spacing +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
 
     public function settings(ConfigEntity $config = null)
     {
-        return View::make('dynamicField/number/default/createSkin', ['config' => $config,])->render();
+        return View::make('dynamicField/number/default/createSkin', ['config' => $config, ])->render();
     }
 
     public function create(array $inputs)
@@ -39,8 +39,8 @@ 
     {
         $config = $this->config;
         $num = '';
-        if (isset($args[$config->get('id') . 'Num'])) {
-            $num = $args[$config->get('id') . 'Num'];
+        if (isset($args[$config->get('id').'Num'])) {
+            $num = $args[$config->get('id').'Num'];
         }
 
 
@@ -54,8 +54,8 @@ 
     {
         $config = $this->config;
         $num = '';
-        if (isset($args[$config->get('id') . 'Num'])) {
-            $num = $args[$config->get('id') . 'Num'];
+        if (isset($args[$config->get('id').'Num'])) {
+            $num = $args[$config->get('id').'Num'];
         }
 
         return View::make('dynamicField/number/default/show', [