xpressengine / xpressengine

core/src/Xpressengine/Routing/Repositories/DatabaseRouteRepository.php

Doc Comments +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
     /**
      * Returns all route items
      *
-     * @return InstanceRoute[]
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function all()
     {
@@ -112,7 +112,7 @@ 
      * Retrieve routes by site key
      *
      * @param string $siteKey site key
-     * @return InstanceRoute[]
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function fetchBySiteKey($siteKey)
     {
@@ -125,7 +125,7 @@ 
      * Retrieve routes by module name
      *
      * @param string $module module name
-     * @return InstanceRoute[]
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function fetchByModule($module)
     {

app/Console/Commands/PluginInstallCommand.php

Doc Comments +5 added lines, -1 removed lines

@@ -68,7 +68,7 @@ 
     /**
      * runComposer
      *
-     * @param $path
+     * @param string $path
      * @param $command
      *
      * @return int
@@ -82,6 +82,10 @@ 
         $output = $this->output;
 
         return $process->run(
+
+            /**
+             * @param string $type
+             */
             function ($type, $line) use ($output) {
                 $output->write($line);
             }

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 
         $this->info(PHP_EOL."Running 'composer $command'.".PHP_EOL);
 
-        if($this->runComposer(base_path(), $command) !== 0) {
+        if ($this->runComposer(base_path(), $command) !== 0) {
             throw new \Exception('Plugin Installation was faild.');
         }
 
@@ -59,7 +59,7 @@ 
 
         $activate = $this->option('activate');
 
-        if($activate) {
+        if ($activate) {
             $this->activatePlugin($name);
             $this->info("Plugin '$name' is activated.".PHP_EOL);
         }
@@ -82,7 +82,7 @@ 
         $output = $this->output;
 
         return $process->run(
-            function ($type, $line) use ($output) {
+            function($type, $line) use ($output) {
                 $output->write($line);
             }
         );

core/src/Xpressengine/Database/Eloquent/DynamicModel.php

Doc Comments +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
      * fill
      *
      * @param array $attributes attributes
-     * @return void
+     * @return DynamicModel
      */
     public function fill(array $attributes)
     {
@@ -247,7 +247,7 @@ 
      * Xpressengine\Database\Eloquent\Builder 울 사용하도록 변경
      *
      * @param  DynamicQuery $query dynamic query builder
-     * @return \Xpressengine\Database\Eloquent\Builder|static
+     * @return Builder
      */
     public function newEloquentBuilder($query)
     {

core/tests/User/UserAccountRepositoryTest.php

Doc Comments -1 removed lines

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

core/tests/User/UserEmailRepositoryTest.php

Doc Comments -1 removed lines

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

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,