Merge pull request #16 from bravo-kernel/namespace

ADmad vendor namespace

Author: ADmad

README.md

@@ -7,44 +7,42 @@
 
 ## Installation
 
-You can install this plugin into your CakePHP application using [composer](http://getcomposer.org).
-
-The recommended way to install composer packages is:
+Install this plugin into your CakePHP application using [composer](http://getcomposer.org):
 
 ```
 composer require admad/cakephp-sequence
 ```
 
-Then load the plugin by adding the following to your app's config/boostrap.php:
+Then load the plugin by either running:
 
-```php
-\Cake\Core\Plugin::load('ADmad/Sequence');
+```bash
+./bin/cake plugin load ADmad/Sequence
 ```
 
-or using CakePHP's console:
+or adding the following line to `config/bootstrap.php`:
 
-```
-./bin/cake plugin load ADmad/Sequence
+```php
+\Cake\Core\Plugin::load('ADmad/Sequence');
 ```
 
 ## How it works
 
-`SequenceBehavior` provided by this plugin maintains a contiguous sequence of 
-integers in a selected column, for records in a table records (optionally with grouping) 
+`SequenceBehavior` provided by this plugin maintains a contiguous sequence of
+integers in a selected column, for records in a table records (optionally with grouping)
 when adding, editing (including moving groups) or deleting records.
 
 ## Usage
 
 Add the `SequenceBehavior` for your table and viola:
 
 ```php
-$this->addBehavior('ADmad/Sequence');
+$this->addBehavior('ADmad/Sequence.Sequence');
 ```
 
 You can customize various options as shown:
 
 ```php
-$this->addBehavior('ADmad/Sequence', [
+$this->addBehavior('ADmad/Sequence.Sequence', [
     'order' => 'position', // Field to use to store integer sequence. Default "position".
     'scope' => ['group_id'], // Array of field names to use for grouping records. Default [].
     'start' => 1, // Initial value for sequence. Default 1.

composer.json

@@ -14,12 +14,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Sequence\\": "src"
+            "ADmad\\Sequence\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Sequence\\Test\\": "tests",
+            "ADmad\\Sequence\\Test\\": "tests",
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
         }
     }

src/Model/Behavior/SequenceBehavior.php

@@ -1,5 +1,5 @@
 <?php
-namespace Sequence\Model\Behavior;
+namespace ADmad\Sequence\Model\Behavior;
 
 use ArrayObject;
 use Cake\Database\Expression\IdentifierExpression;
@@ -307,7 +307,7 @@ function ($connection) use ($table, $records, $config) {
             }
         );
 
-        $table->addBehavior('Sequence.Sequence', $config);
+        $table->addBehavior('ADmad/Sequence.Sequence', $config);
 
         return $return;
     }

tests/Fixture/GroupedItemsFixture.php

@@ -1,5 +1,5 @@
 <?php
-namespace Sequence\Test\Fixture;
+namespace ADmad\Sequence\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;
 

tests/Fixture/ItemsFixture.php

@@ -1,5 +1,5 @@
 <?php
-namespace Sequence\Test\Fixture;
+namespace ADmad\Sequence\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;
 

tests/Fixture/KeywordItemsFixture.php

@@ -1,5 +1,5 @@
 <?php
-namespace Sequence\Test\Fixture;
+namespace ADmad\Sequence\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;
 

tests/TestCase/Model/Behavior/SequenceBehaviorTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Sequence\Test\TestCase\Model\Behavior;
+namespace ADmad\Sequence\Test\TestCase\Model\Behavior;
 
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
@@ -15,16 +15,16 @@ class Items extends Table
 {
     public function initialize(array $config)
     {
-        $this->entityClass('Sequence\Test\TestCase\Model\Behavior\Item');
-        $this->addBehavior('Sequence.Sequence', ['start' => 0]);
+        $this->entityClass('ADmad\Sequence\Test\TestCase\Model\Behavior\Item');
+        $this->addBehavior('ADmad/Sequence.Sequence', ['start' => 0]);
     }
 }
 
 class GroupedItems extends Table
 {
     public function initialize(array $config)
     {
-        $this->addBehavior('Sequence.Sequence', [
+        $this->addBehavior('ADmad/Sequence.Sequence', [
             'start' => 0,
             'scope' => 'group_field',
         ]);
@@ -35,7 +35,7 @@ class KeywordItems extends Table
 {
     public function initialize(array $config)
     {
-        $this->addBehavior('Sequence.Sequence', [
+        $this->addBehavior('ADmad/Sequence.Sequence', [
             'order' => 'order',
             'start' => 0,
         ]);
@@ -45,9 +45,9 @@ public function initialize(array $config)
 class SequenceTest extends TestCase
 {
     public $fixtures = [
-        'plugin.Sequence.Items',
-        'plugin.Sequence.GroupedItems',
-        'plugin.Sequence.KeywordItems',
+        'plugin.ADmad/Sequence.Items',
+        'plugin.ADmad/Sequence.GroupedItems',
+        'plugin.ADmad/Sequence.KeywordItems',
     ];
 
     /**
@@ -58,7 +58,7 @@ class SequenceTest extends TestCase
     public function testSave()
     {
         $Items = TableRegistry::get('Items', [
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\Items',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\Items',
         ]);
 
         // Testing saving a new record (order not specified) sets order to highest + 1
@@ -94,7 +94,7 @@ public function testSaveScoped()
         $GroupedItems = TableRegistry::get('GroupedItems', [
             'table' => 'grouped_items',
             'alias' => 'GroupedItems',
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\GroupedItems',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\GroupedItems',
         ]);
 
         // Testing saving a new record (order not specified) sets order to highest + 1
@@ -145,7 +145,7 @@ public function testSaveNullScoped()
         $GroupedItems = TableRegistry::get('GroupedItems', [
             'table' => 'grouped_items',
             'alias' => 'GroupedItems',
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\GroupedItems',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\GroupedItems',
         ]);
 
         // Test group 2 (group_field = 2) as group NULL (group_field = null)
@@ -199,7 +199,7 @@ public function testSaveKeyword()
         $KeywordItems = TableRegistry::get('KeywordItems', [
             'table' => 'keyword_items',
             'alias' => 'KeywordItems',
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\KeywordItems',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\KeywordItems',
         ]);
 
         // Testing saving a new record (order not specified) sets order to highest + 1
@@ -216,7 +216,7 @@ public function testSaveKeyword()
     public function testDelete()
     {
         $Items = TableRegistry::get('Items', [
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\Items',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\Items',
         ]);
 
         $entity = $Items->get(3);
@@ -231,7 +231,7 @@ public function testDelete()
         $GroupedItems = TableRegistry::get('GroupedItems', [
             'table' => 'grouped_items',
             'alias' => 'GroupedItems',
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\GroupedItems',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\GroupedItems',
         ]);
 
         $entity = $GroupedItems->get(3);
@@ -249,7 +249,7 @@ public function testDelete()
     public function testSetOrder()
     {
         $Items = TableRegistry::get('Items', [
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\Items',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\Items',
         ]);
 
         // Array of arrays
@@ -289,15 +289,17 @@ public function testSetOrder()
         $GroupedItems = TableRegistry::get('GroupedItems', [
             'table' => 'grouped_items',
             'alias' => 'GroupedItems',
-            'className' => 'Sequence\Test\TestCase\Model\Behavior\GroupedItems',
+            'className' => 'ADmad\Sequence\Test\TestCase\Model\Behavior\GroupedItems',
         ]);
+
         $result = $GroupedItems->setOrder([
             ['id' => 4],
             ['id' => 3],
             ['id' => 2],
             ['id' => 1],
             ['id' => 5],
         ]);
+
         $this->assertTrue($result);
         $this->assertOrder([4, 3, 2, 1, 5], $GroupedItems, ['group_field' => 1]);
         $this->assertOrder([6, 7, 8, 9, 10], $GroupedItems, ['group_field' => 2]);