Merge branch 'develop'

Author: socheatsok78

.travis.yml

@@ -12,4 +12,4 @@ install:
   - composer install
 
 script:
-  - "./vendor/bin/phpunit --coverage-text"
+  - "./vendor/bin/phpunit --testdox --coverage-text"

README.md

@@ -2,6 +2,7 @@
 
 [![Latest Stable Version](https://poser.pugx.org/pp-spaces/laravel-repository/v/stable)](https://packagist.org/packages/pp-spaces/laravel-repository)
 [![Total Downloads](https://poser.pugx.org/pp-spaces/laravel-repository/downloads)](https://packagist.org/packages/pp-spaces/laravel-repository)
+[![Build Status](https://travis-ci.org/pp-spaces/laravel-repository.svg?branch=develop)](https://travis-ci.org/pp-spaces/laravel-repository)
 [![License](https://poser.pugx.org/pp-spaces/laravel-repository/license)](https://packagist.org/packages/pp-spaces/laravel-repository)
 
 ## Contents

composer.json

@@ -50,7 +50,7 @@
   },
   "scripts": {
     "test": [
-      "vendor/bin/phpunit --testdox --coverage-text"
+      "vendor/bin/phpunit --testdox"
     ]
   }
 }

src/Facade/Repository.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace PPSpaces\Facade;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @see \PPSpaces\Repositories\Repository
+ */
+class Repository extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'PPSpaces\Repositories\Repository';
+    }
+}

src/Repositories/Repository.php

@@ -4,8 +4,6 @@
 
 use ReflectionClass;
 
-use Illuminate\Container\Container as App;
-
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Routing\UrlRoutable;
 
@@ -57,9 +55,8 @@ abstract class Repository implements RepositoryContract, UrlRoutable
      * @param  \Illuminate\Database\Eloquent\Model  $model
      * @return void
      */
-    public function __construct(App $app) {
-        $this->app = $app;
-
+    public function __construct() {
+        // Initialize Repository Instance
         $this->initializeRepository();
     }
 
@@ -69,7 +66,9 @@ public function __construct(App $app) {
      * @param \Illuminate\Database\Query\Builder $query
      * @return void
      */
-    abstract public function before($query);
+    public function before($query) {
+        //
+    }
 
     /**
      * Get all of the models from the database.
@@ -139,7 +138,9 @@ public function delete($id) {
      * @param  \Illuminate\Support\Collection|array|int  $ids
      * @return int
      */
-    abstract static function destroy($ids);
+    static function destroy($ids) {
+        //
+    }
 
     /**
      * Specify Model class name
@@ -158,14 +159,20 @@ public function model() {
      * @throws PPSpaces\Exceptions\RepositoryException
      */
     public function initializeRepository() {
+        // Loading application instance
+        $this->app = app();
+
+        // Making model
         $model = $this->app->make($this->model);
 
         if (!$model instanceof Model) {
             throw new RepositoryException("Class {$this->model} must be an instance of Illuminate\\Database\\Eloquent\\Model");
         }
 
+        // Create repository model query
         $this->repository = $model->newQuery();
 
+        // Inject before scope
         $this->before($this->repository);
     }
 
@@ -215,6 +222,6 @@ public function __toString()
             return $this->resolved->toJson();
         }
 
-        return null;
+        return $this->get()->toJson();
     }
 }

tests/Feature/App/RepositoryTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace PPSpaces\Tests\Feature\App;
+
+use PPSpaces\Tests\App\User;
+use PPSpaces\Tests\TestCase;
+use PPSpaces\Tests\App\Http\Repositories\UserRepository;
+use Illuminate\Container\Container as App;
+
+/**
+ * Class DatabaseTest
+ */
+class RepositoryTest extends TestCase
+{
+    public function test_it_get_datas_from_repository()
+    {
+        // When we have 50 users
+        $users = factory(User::class, 50)->create();
+
+        // Then make make the repository
+        $users = new UserRepository();
+
+        // Should give us all available users
+        $this->assertCount(50, $users->get());
+    }
+}

tests/Feature/Console/RepositoryTest.php

@@ -14,18 +14,6 @@ public function test_it_can_generate_repository_command()
     {
         $this->artisan('make:repository', [
             'name' => 'LogsRepository'
-        ])
-            ->expectsOutput('Repository created successfully.')
-            ->assertExitCode(0);
-    }
-
-    public function test_it_can_generate_model_repository_command()
-    {
-        $this->artisan('make:repository', [
-            'name' => 'UserRepository',
-            '--model' => 'PPSpaces\Tests\App\User'
-        ])
-            ->expectsOutput('Repository created successfully.')
-            ->assertExitCode(0);
+        ])->assertExitCode(0);
     }
 }

tests/TestCase.php

@@ -9,13 +9,34 @@ abstract class TestCase extends BaseTestCase
     use CreatesDatabase;
 
     /**
-     * To load your package service provider
+     * Get package providers.  At a minimum this is the package being tested, but also
+     * would include packages upon which our package depends, e.g. Cartalyst/Sentry
+     * In a normal app environment these would be added to the 'providers' array in
+     * the config/app.php file.
      *
-     * @param [mixed] $app
-     * @return void
+     * @param  \Illuminate\Foundation\Application  $app
+     *
+     * @return array
      */
     protected function getPackageProviders($app)
     {
         return ['PPSpaces\RepositoryServiceProvider'];
     }
+
+    /**
+     * Get package aliases.  In a normal app environment these would be added to
+     * the 'aliases' array in the config/app.php file.  If your package exposes an
+     * aliased facade, you should add the alias here, along with aliases for
+     * facades upon which your package depends, e.g. Cartalyst/Sentry.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     *
+     * @return array
+     */
+    protected function getPackageAliases($app)
+    {
+        return [
+            'PPSpaces' => 'PPSpaces\Facade'
+        ];
+    }
 }

tests/app/Http/Repositories/UserRepository.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace PPSpaces\Tests\App\Http\Repositories;
+
+use PPSpaces\Repositories\Repository;
+
+class UserRepository extends Repository {
+
+    /**
+     * The \PPSpaces\Tests\App\User model instance.
+     *
+     * @var \PPSpaces\Tests\App\User
+     */
+    protected $model = "PPSpaces\Tests\App\User";
+
+}