Add support of Laravel 5.5. Update namespace

.travis.yml

@@ -5,6 +5,7 @@ sudo: false
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to `laravel-optimus` will be documented in this file.
 
+## [2.0.0] - 2017-07-29
+
+### Added
+
+- Laravel 5.5 support
+- Service provider and facade auto-discovery
+
+### Changed
+
+- Namespace `Cog\Optimus` renamed to `Cog\Laravel\Optimus`
+
 ## 1.0.0 - 2017-01-01
 
 Initial release
+
+[2.0.0]: https://github.com/cybercog/laravel-optimus/compare/1.0.0...2.0.0

README.md

@@ -1,4 +1,4 @@
-![cog-laravel-optimus-3](https://cloud.githubusercontent.com/assets/1849174/21738350/6c08b624-d494-11e6-9895-94e7d5f39010.png)
+![cog-laravel-optimus](https://user-images.githubusercontent.com/1849174/28744713-5b28fffa-746f-11e7-8ca2-0e2a612bc19c.png)
 
 <p align="center">
 <a href="https://travis-ci.org/cybercog/laravel-optimus"><img src="https://img.shields.io/travis/cybercog/laravel-optimus/master.svg?style=flat-square" alt="Build Status"></a>
@@ -16,6 +16,7 @@ Laravel wrapper for the [Optimus Library](https://github.com/jenssegers/optimus)
 - Designed to work with Laravel Eloquent models.
 - Configurable multiple connections support.
 - Following PHP Standard Recommendations:
+  - [PSR-1 (Basic Coding Standard)](http://www.php-fig.org/psr/psr-1/).
   - [PSR-2 (Coding Style Guide)](http://www.php-fig.org/psr/psr-2/).
   - [PSR-4 (Autoloading Standard)](http://www.php-fig.org/psr/psr-4/).
 - Covered with unit tests.
@@ -32,15 +33,15 @@ And then include the service provider within `app/config/app.php`.
 
 ```php
 'providers' => [
-    Cog\Optimus\Providers\OptimusServiceProvider::class,
+    Cog\Laravel\Optimus\Providers\OptimusServiceProvider::class,
 ],
 ```
 
 If you want you can use the [facade](http://laravel.com/docs/facades). Add the reference in `config/app.php` to your aliases array.
 
 ```php
 'aliases' => [
-    'Optimus' => Cog\Optimus\Facades\Optimus::class,
+    'Optimus' => Cog\Laravel\Optimus\Facades\Optimus::class,
 ],
 ```
 
@@ -49,7 +50,7 @@ If you want you can use the [facade](http://laravel.com/docs/facades). Add the r
 Laravel Optimus requires connection configuration. To get started, you'll need to publish config file:
 
 ```sh
-$ php artisan vendor:publish --provider="Cog\Optimus\Providers\OptimusServiceProvider" --tag="config"
+$ php artisan vendor:publish --provider="Cog\Laravel\Optimus\Providers\OptimusServiceProvider" --tag="config"
 ```
 
 This will create a `config/optimus.php` file in your app that you can modify to set your configuration. Also, make sure you check for changes to the original config file in this package between releases.
@@ -99,21 +100,21 @@ Here you can see an example of just how simple this package is to use. Out of th
 #### Encode ID
 
 ```php 
-Cog\Optimus\Facades\Optimus::encode(20); // 1535832388
+Cog\Laravel\Optimus\Facades\Optimus::encode(20); // 1535832388
 ```
 
 #### Decode ID
 
 ```php
-Cog\Optimus\Facades\Optimus::decode(1535832388); // 20
+Cog\Laravel\Optimus\Facades\Optimus::decode(1535832388); // 20
 ```
 
 #### Alter Optimus connection
 
 The Optimus manager will behave like it is a `Jenssegers\Optimus\Optimus`. If you want to call specific connections, you can do that with the connection method:
 
 ```php
-use Cog\Optimus\Facades\Optimus;
+use Cog\Laravel\Optimus\Facades\Optimus;
 
 // Writing this…
 Optimus::connection('main')->encode($id);
@@ -136,7 +137,7 @@ Optimus::setDefaultConnection('alternative'); // The default is now alternative.
 If you prefer to use dependency injection over facades like me, then you can inject the manager:
 
 ```php
-use Cog\Optimus\OptimusManager;
+use Cog\Laravel\Optimus\OptimusManager;
 
 class Foo
 {

composer.json

@@ -34,27 +34,27 @@
         "docs": "https://github.com/cybercog/laravel-optimus/wiki"
     },
     "require": {
-        "graham-campbell/manager": "^2.5",
-        "illuminate/contracts": "~5.2.0|~5.3.0|~5.4.0",
-        "illuminate/support": "~5.2.0|~5.3.0|~5.4.0",
-        "jenssegers/optimus": "^0.2.2",
-        "php": "^7.0"
+        "php": "^7.0",
+        "graham-campbell/manager": "^3.0",
+        "illuminate/contracts": "~5.2|~5.3|~5.4|~5.5",
+        "illuminate/support": "~5.2|~5.3|~5.4|~5.5",
+        "jenssegers/optimus": "^0.2.2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^1.11",
-        "graham-campbell/testbench": "^3.3",
+        "graham-campbell/testbench": "^4.0",
         "mockery/mockery": "^0.9.8",
         "orchestra/testbench": "~3.4.0",
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^6.2"
     },
     "autoload": {
         "psr-4": {
-            "Cog\\Optimus\\": "src/"
+            "Cog\\Laravel\\Optimus\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Cog\\Optimus\\Tests\\": "tests/"
+            "Cog\\Laravel\\Optimus\\Tests\\": "tests/"
         }
     },
     "scripts": {
@@ -63,6 +63,16 @@
     "config": {
         "sort-packages": true
     },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Cog\\Laravel\\Optimus\\Providers\\OptimusServiceProvider"
+            ],
+            "aliases": {
+                "Optimus": "Cog\\Laravel\\Optimus\\Facades\\Optimus"
+            }
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable" : true
 }

src/Facades/Optimus.php

@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus\Facades;
+namespace Cog\Laravel\Optimus\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
 /**
  * Class Optimus.
  *
- * @package Cog\Optimus\Facades
+ * @package Cog\Laravel\Optimus\Facades
  */
 class Optimus extends Facade
 {

src/OptimusFactory.php

@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus;
+namespace Cog\Laravel\Optimus;
 
 use Jenssegers\Optimus\Optimus;
 
 /**
  * Class OptimusFactory.
  *
- * @package Cog\Optimus
+ * @package Cog\Laravel\Optimus
  */
 class OptimusFactory
 {

src/OptimusManager.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus;
+namespace Cog\Laravel\Optimus;
 
 use Jenssegers\Optimus\Optimus;
 use GrahamCampbell\Manager\AbstractManager;
@@ -20,22 +20,22 @@
 /**
  * Class OptimusManager.
  *
- * @package Cog\Optimus
+ * @package Cog\Laravel\Optimus
  */
 class OptimusManager extends AbstractManager
 {
     /**
      * The factory instance.
      *
-     * @var \Cog\Optimus\OptimusFactory
+     * @var \Cog\Laravel\Optimus\OptimusFactory
      */
     private $factory;
 
     /**
      * Create a new Optimus manager instance.
      *
      * @param \Illuminate\Contracts\Config\Repository $config
-     * @param \Cog\Optimus\OptimusFactory $factory
+     * @param \Cog\Laravel\Optimus\OptimusFactory $factory
      * @return void
      */
     public function __construct(Repository $config, OptimusFactory $factory)
@@ -69,7 +69,7 @@ protected function getConfigName() : string
     /**
      * Get the factory instance.
      *
-     * @return \Cog\Optimus\OptimusFactory
+     * @return \Cog\Laravel\Optimus\OptimusFactory
      */
     public function getFactory() : OptimusFactory
     {

src/Providers/OptimusServiceProvider.php

@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus\Providers;
+namespace Cog\Laravel\Optimus\Providers;
 
-use Cog\Optimus\OptimusFactory;
-use Cog\Optimus\OptimusManager;
+use Cog\Laravel\Optimus\OptimusFactory;
+use Cog\Laravel\Optimus\OptimusManager;
 use Jenssegers\Optimus\Optimus;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Container\Container;
@@ -24,7 +24,7 @@
 /**
  * Class OptimusServiceProvider.
  *
- * @package Cog\Optimus
+ * @package Cog\Laravel\Optimus\Providers
  */
 class OptimusServiceProvider extends ServiceProvider
 {

tests/AbstractTestCase.php

@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus\Tests;
+namespace Cog\Laravel\Optimus\Tests;
 
-use Cog\Optimus\Providers\OptimusServiceProvider;
+use Cog\Laravel\Optimus\Providers\OptimusServiceProvider;
 use GrahamCampbell\TestBench\AbstractPackageTestCase;
 
 /**
  * Class AbstractTestCase.
  *
- * @package Cog\Optimus\Tests
+ * @package Cog\Laravel\Optimus\Tests
  */
 abstract class AbstractTestCase extends AbstractPackageTestCase
 {

tests/Facades/OptimusTest.php

@@ -11,17 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus\Tests\Facades;
+namespace Cog\Laravel\Optimus\Tests\Facades;
 
-use Cog\Optimus\OptimusManager;
-use Cog\Optimus\Facades\Optimus;
-use Cog\Optimus\Tests\AbstractTestCase;
+use Cog\Laravel\Optimus\OptimusManager;
+use Cog\Laravel\Optimus\Facades\Optimus;
+use Cog\Laravel\Optimus\Tests\AbstractTestCase;
 use GrahamCampbell\TestBenchCore\FacadeTrait;
 
 /**
  * Class OptimusTest.
  *
- * @package Cog\Optimus\Tests\Facades
+ * @package Cog\Laravel\Optimus\Tests\Facades
  */
 class OptimusTest extends AbstractTestCase
 {

tests/OptimusFactoryTest.php

@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus\Tests;
+namespace Cog\Laravel\Optimus\Tests;
 
-use Cog\Optimus\OptimusFactory;
+use Cog\Laravel\Optimus\OptimusFactory;
 use Jenssegers\Optimus\Optimus;
 
 /**
  * Class OptimusFactoryTest.
  *
- * @package Cog\Optimus\Tests
+ * @package Cog\Laravel\Optimus\Tests
  */
 class OptimusFactoryTest extends AbstractTestCase
 {

tests/OptimusManagerTest.php

@@ -11,19 +11,19 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus\Tests;
+namespace Cog\Laravel\Optimus\Tests;
 
 use Mockery;
-use Cog\Optimus\OptimusFactory;
-use Cog\Optimus\OptimusManager;
+use Cog\Laravel\Optimus\OptimusFactory;
+use Cog\Laravel\Optimus\OptimusManager;
 use Jenssegers\Optimus\Optimus;
 use Illuminate\Contracts\Config\Repository;
 use GrahamCampbell\TestBench\AbstractTestCase as AbstractTestBenchTestCase;
 
 /**
  * Class OptimusManagerTest.
  *
- * @package Cog\Optimus\Tests
+ * @package Cog\Laravel\Optimus\Tests
  */
 class OptimusManagerTest extends AbstractTestBenchTestCase
 {

tests/Providers/ServiceProviderTest.php

@@ -11,17 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Cog\Optimus\Tests;
+namespace Cog\Laravel\Optimus\Tests;
 
-use Cog\Optimus\OptimusFactory;
-use Cog\Optimus\OptimusManager;
+use Cog\Laravel\Optimus\OptimusFactory;
+use Cog\Laravel\Optimus\OptimusManager;
 use Jenssegers\Optimus\Optimus;
 use GrahamCampbell\TestBenchCore\ServiceProviderTrait;
 
 /**
  * Class ServiceProviderTest.
  *
- * @package Cog\Optimus\Tests\Providers
+ * @package Cog\Laravel\Optimus\Tests\Providers
  */
 class ServiceProviderTest extends AbstractTestCase
 {