Смена пространств имён

Resolve #11

.gitignore

@@ -1,3 +1 @@
-composer.phar
+/vendor
-composer.lock
-vendor

composer.json

@@ -1,26 +1,45 @@
 {
-    "name": "explosivebit/yii2-arangodb",
+    "name": "mirzaev/yii2-arangodb",
-    "description": "Yii2 arangodb components",
+    "description": "Library for connecting ArangoDB-PHP to Yii2",
+    "keywords": [
+        "Yii2",
+        "ArangoDB"
+    ],
     "type": "yii2-extension",
-    "keywords": ["yii2","arangodb"],
+    "license": "AGPL-3.0-or-later",
-    "license": "GPL-3.0+",
+    "homepage": "https://git.hood.su/mirzaev/yii2/arangodb",
     "authors": [
+        {
+            "name": "Arsen Mirzaev Tatyano-Muradovich",
+            "email": "red@hood.su",
+            "homepage": "https://hood.su/mirzaev",
+            "role": "Developer"
+        },
         {
             "name": "Ilya Rumyantsev",
             "email": "explosivebit@gmail.com"
+        },
+        {
+            "name": "Alvian Burhanuddin",
+            "email": "alvianthelfarqy@gmail.com"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
+        "php": "^8.0.0",
         "yiisoft/yii2": "*",
-        "triagens/arangodb": "*"
+        "triagens/arangodb": "~3.2"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "*"
     },
     "autoload": {
         "psr-4": {
-            "explosivebit\\arangodb\\": ""
+            "mirzaev\\yii2\\arangodb\\": "mirzaev/yii2-arangodb"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "mirzaev\\yii2\\arangodb\\tests\\": "mirzaev/yii2-arangodb/tests"
         }
     }
 }

mirzaev/yii2-arangodb/ActiveQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
 use Yii;
 use yii\db\ActiveQueryInterface;
@@ -104,14 +104,14 @@ class ActiveQuery extends Query implements ActiveQueryInterface
     {
         $statement = $this->createCommand($db);
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::query');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             $cursor = $statement->execute();
             $rows = $cursor->getAll();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         if (!empty($rows)) {

mirzaev/yii2-arangodb/ActiveRecord.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
 use Yii;
 use yii\base\InvalidConfigException;

mirzaev/yii2-arangodb/AqlExpression.php

@@ -1,11 +1,6 @@
 <?php
-/**
- * User: evgen-d
- * Date: 08.10.14
- * Time: 16:00
- */
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
 use yii\base\Object;
 
@@ -37,4 +32,3 @@ class AqlExpression extends Object
         return $this->expression;
     }
 }
- 

mirzaev/yii2-arangodb/Connection.php

@@ -1,18 +1,21 @@
 <?php
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
+use ArangoDBClient\EdgeHandler;
+use ArangoDBClient\Export;
+use ArangoDBClient\GraphHandler;
 use Yii;
-use triagens\ArangoDb\CollectionHandler;
+use ArangoDBClient\CollectionHandler;
-use triagens\ArangoDb\ConnectionOptions;
+use ArangoDBClient\ConnectionOptions;
-use triagens\ArangoDb\Document;
+use ArangoDBClient\Document;
-use triagens\ArangoDb\DocumentHandler;
+use ArangoDBClient\DocumentHandler;
-use triagens\ArangoDb\Statement;
+use ArangoDBClient\Statement;
-use triagens\ArangoDb\UpdatePolicy;
+use ArangoDBClient\UpdatePolicy;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
-class Connection extends Object
+class Connection extends BaseObject
 {
     private $connection = null;
 
@@ -42,6 +45,10 @@ class Connection extends Object
     private $collectionHandler = null;
     /** @var null|DocumentHandler $documentHandler */
     private $documentHandler = null;
+    /** @var null|EdgeHandler $documentHandler */
+    private $edgeHandler = null;
+    /** @var null|EdgeHandler $graphHandler */
+    private $graphHandler = null;
 
     public function init()
     {
@@ -49,18 +56,28 @@ class Connection extends Object
 
         $token = 'Opening ArangoDB connection: ' . $this->connectionOptions[ConnectionOptions::OPTION_ENDPOINT];
         try {
-            Yii::info($token, 'explosivebit\arangodb\Connection::open');
+            Yii::info($token, 'mirzaev\yii2\arangodb\Connection::open');
-            Yii::beginProfile($token, 'explosivebit\arangodb\Connection::open');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Connection::open');
-            $this->connection = new \triagens\ArangoDb\Connection($this->connectionOptions);
+            $this->connection        = new \ArangoDBClient\Connection($this->connectionOptions);
             $this->collectionHandler = new CollectionHandler($this->connection);
             $this->documentHandler   = new DocumentHandler($this->connection);
-            Yii::endProfile($token, 'explosivebit\arangodb\Connection::open');
+            $this->edgeHandler       = new EdgeHandler($this->connection);
+            $this->graphHandler      = new GraphHandler($this->connection);
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Connection::open');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Connection::open');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Connection::open');
-            throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
+            throw new \Exception($ex->getMessage(), (int)$ex->getCode(), $ex);
         }
     }
 
+    /**
+     * @return EdgeHandler|null
+     */
+    public function getGraphHandler(): EdgeHandler
+    {
+        return $this->graphHandler;
+    }
+
     /**
      * @return null|CollectionHandler
      */
@@ -86,6 +103,14 @@ class Connection extends Object
         return $this->documentHandler;
     }
 
+    /**
+     * @return null|EdgeHandler
+     */
+    public function getEdgeHandler()
+    {
+        return $this->edgeHandler;
+    }
+
     /**
      * @param $collectionId
      * @param $documentId
@@ -104,4 +129,12 @@ class Connection extends Object
     {
         return new Statement($this->connection, $options);
     }
+
+    /**
+     * @param array $options
+     * @return Export
+     */
+    public function getExport($options = []) {
+        return new Export($this->connection, $options);
+    }
 }

mirzaev/yii2-arangodb/Exception.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
 class Exception extends \yii\base\Exception
 {

mirzaev/yii2-arangodb/Migration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
 use yii\base\Component;
 use yii\db\MigrationInterface;

mirzaev/yii2-arangodb/Query.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
 use Yii;
-use triagens\ArangoDb\Document;
+use ArangoDBClient\Document;
-use triagens\ArangoDb\Statement;
+use ArangoDBClient\Statement;
 use yii\base\Component;
 use yii\base\InvalidParamException;
 use yii\base\NotSupportedException;
@@ -131,13 +131,13 @@ class Query extends Component implements QueryInterface
         $options = ArrayHelper::merge($params, $options);
         $statement = $this->getStatement($options);
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::query');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             $cursor = $statement->execute();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         return $this->prepareResult($cursor->getAll());
@@ -619,13 +619,13 @@ class Query extends Component implements QueryInterface
     {
         $statement = $this->createCommand($db);
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::query');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             $cursor = $statement->execute();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         return $this->prepareResult($cursor->getAll());
@@ -641,13 +641,13 @@ class Query extends Component implements QueryInterface
         $this->limit(1);
         $statement = $this->createCommand($db);
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::query');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             $cursor = $statement->execute();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         $result = $this->prepareResult($cursor->getAll());
@@ -682,13 +682,13 @@ class Query extends Component implements QueryInterface
 
         $statement = $this->getStatement($params, $db);
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::insert');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::insert');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::insert');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::insert');
             $cursor = $statement->execute();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::insert');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::insert');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::insert');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::insert');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         return true;
@@ -725,13 +725,13 @@ class Query extends Component implements QueryInterface
 
         $statement = $this->getStatement($params, $db);
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::update');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::update');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::update');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::update');
             $cursor = $statement->execute();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::update');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::update');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::update');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::update');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         $meta = $cursor->getMetadata();
@@ -770,13 +770,13 @@ class Query extends Component implements QueryInterface
 
         $statement = $this->getStatement($params, $db);
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::remove');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::remove');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::remove');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::remove');
             $cursor = $statement->execute();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::remove');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::remove');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::remove');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::remove');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         $meta = $cursor->getMetadata();
@@ -859,13 +859,13 @@ class Query extends Component implements QueryInterface
         $statement->setBatchSize(1);
 
         $token = $this->getRawAql($statement);
-        Yii::info($token, 'explosivebit\arangodb\Query::query');
+        Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
         try {
-            Yii::beginProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             $cursor = $statement->execute();
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
         } catch (\Exception $ex) {
-            Yii::endProfile($token, 'explosivebit\arangodb\Query::query');
+            Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
             throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
         }
         return $cursor->getFullCount();

mirzaev/yii2-arangodb/README.RU.md

@@ -36,11 +36,11 @@ return [
         'arangodb' => [
             'class' => '\explosivebit\arangodb\Connection',
             'connectionOptions' => [
-                triagens\ArangoDb\ConnectionOptions::OPTION_DATABASE => "mydatabase",
+                ArangoDBClient\ConnectionOptions::OPTION_DATABASE => "mydatabase",
-                triagens\ArangoDb\ConnectionOptions::OPTION_ENDPOINT => 'tcp://127.0.0.1:8529',
+                ArangoDBClient\ConnectionOptions::OPTION_ENDPOINT => 'tcp://127.0.0.1:8529',
-                triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_TYPE => 'Basic',
+                ArangoDBClient\ConnectionOptions::OPTION_AUTH_TYPE => 'Basic',
-                //triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_USER   => '',
+                //ArangoDBClient\ConnectionOptions::OPTION_AUTH_USER   => '',
-                //triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_PASSWD => '',
+                //ArangoDBClient\ConnectionOptions::OPTION_AUTH_PASSWD => '',
             ],
         ],
     ],

mirzaev/yii2-arangodb/README.md

@@ -1,3 +1,6 @@
+[Описание на Русском](https://github.com/explosivebit/yii2-arangodb/blob/master/README.RU.md)
+
+
 ArangoDb Extension for Yii 2
 ===========================
 
@@ -38,11 +41,11 @@ return [
         'arangodb' => [
             'class' => '\explosivebit\arangodb\Connection',
             'connectionOptions' => [
-                triagens\ArangoDb\ConnectionOptions::OPTION_DATABASE => "mydatabase",
+                ArangoDBClient\ConnectionOptions::OPTION_DATABASE => "mydatabase",
-                triagens\ArangoDb\ConnectionOptions::OPTION_ENDPOINT => 'tcp://127.0.0.1:8529',
+                ArangoDBClient\ConnectionOptions::OPTION_ENDPOINT => 'tcp://127.0.0.1:8529',
-                triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_TYPE => 'Basic',
+                ArangoDBClient\ConnectionOptions::OPTION_AUTH_TYPE => 'Basic',
-                //triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_USER   => '',
+                //ArangoDBClient\ConnectionOptions::OPTION_AUTH_USER   => '',
-                //triagens\ArangoDb\ConnectionOptions::OPTION_AUTH_PASSWD => '',
+                //ArangoDBClient\ConnectionOptions::OPTION_AUTH_PASSWD => '',
             ],
         ],
     ],
@@ -155,8 +158,36 @@ yii arangodb-migrate/create create_user_collection
 # applies ALL new migrations
 yii arangodb-migrate
 
+# Apply 1 migration
+yii arangodb-migrate/up 1
+
 # reverts the last applied migration
 yii arangodb-migrate/down
+
+# Rollback 1 migration
+yii arangodb-migrate/down 1
+```
+
+Once migration created, you can configure the migration:
+
+When you start the migration as in the example below, you create a normal document collection with the migration name, you need to add an additional parameter `Type => 3` to create the `edge collection`. Example of such a query: `$this-> createCollection ('services', ['Type' => 3] );` If you want to create a document collection, then delete the `'Type' => 3` or replace the number 3 with 2.
+
+
+```php
+class m170413_210957_create_services_collection extends \explosivebit\arangodb\Migration
+{
+    public function up()
+    {
+        # When you start the migration, a collection of "services" with the edge type is created
+        $this->createCollection('services',['Type' => 3]);
+    }
+
+    public function down()
+    {
+        # When the migration rollback starts, the collection "services"
+        $this->dropCollection('services');
+    }
+}
 ```
 
 

mirzaev/yii2-arangodb/Serializer.php

@@ -1,11 +1,6 @@
 <?php
-/**
- * User: evgen-d
- * Date: 08.10.14
- * Time: 16:04
- */
 
-namespace explosivebit\arangodb;
+namespace mirzaev\yii2\arangodb;
 
 use yii\base\Arrayable;
 
@@ -56,4 +51,3 @@ class Serializer
         return $data;
     }
 }
- 

mirzaev/yii2-arangodb/console/controllers/MigrateController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace explosivebit\arangodb\console\controllers;
+namespace mirzaev\yii2\arangodb\console\controllers;
 
-use explosivebit\arangodb\Connection;
+use mirzaev\yii2\arangodb\Connection;
-use explosivebit\arangodb\Exception;
+use mirzaev\yii2\arangodb\Exception;
-use explosivebit\arangodb\Migration;
+use mirzaev\yii2\arangodb\Migration;
-use explosivebit\arangodb\Query;
+use mirzaev\yii2\arangodb\Query;
 
 use yii;
 use yii\console\controllers\BaseMigrateController;

mirzaev/yii2-arangodb/panels/arangodb/ArangoDbPanel.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace explosivebit\arangodb\panels\arangodb;
+namespace mirzaev\yii2\arangodb\panels\arangodb;
 
-use explosivebit\arangodb\panels\arangodb\models\ArangoDb;
+use mirzaev\yii2\arangodb\panels\arangodb\models\ArangoDb;
 use Yii;
 use yii\debug\Panel;
 use yii\log\Logger;
@@ -31,11 +31,11 @@ class ArangoDbPanel extends Panel
             $target->messages,
             Logger::LEVEL_PROFILE,
             [
-                'explosivebit\arangodb\Query::query',
+                'mirzaev\yii2\arangodb\Query::query',
-                'explosivebit\arangodb\Query::insert',
+                'mirzaev\yii2\arangodb\Query::insert',
-                'explosivebit\arangodb\Query::update',
+                'mirzaev\yii2\arangodb\Query::update',
-                'explosivebit\arangodb\Query::remove',
+                'mirzaev\yii2\arangodb\Query::remove',
-                'explosivebit\arangodb\Query::execute',
+                'mirzaev\yii2\arangodb\Query::execute',
             ]
         );
     }
@@ -136,15 +136,15 @@ class ArangoDbPanel extends Panel
 
     protected function getQueryType($category) {
         switch ($category) {
-            case 'explosivebit\arangodb\Query::query' :
+            case 'mirzaev\yii2\arangodb\Query::query' :
                 return 'SELECT';
-            case 'explosivebit\arangodb\Query::insert' :
+            case 'mirzaev\yii2\arangodb\Query::insert' :
                 return 'INSERT';
-            case 'explosivebit\arangodb\Query::update' :
+            case 'mirzaev\yii2\arangodb\Query::update' :
                 return 'UPDATE';
-            case 'explosivebit\arangodb\Query::remove' :
+            case 'mirzaev\yii2\arangodb\Query::remove' :
                 return 'REMOVE';
-            case 'explosivebit\arangodb\Query::execute' :
+            case 'mirzaev\yii2\arangodb\Query::execute' :
                 return 'EXECUTE';
             default :
                 return '';

mirzaev/yii2-arangodb/panels/arangodb/models/ArangoDb.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace explosivebit\arangodb\panels\arangodb\models;
+namespace mirzaev\yii2\arangodb\panels\arangodb\models;
 
 use yii;
 use yii\data\ArrayDataProvider;

mirzaev/yii2-arangodb/views/migration.php

@@ -8,7 +8,7 @@
 echo "<?php\n";
 ?>
 
-class <?= $className ?> extends \explosivebit\arangodb\Migration
+class <?= $className ?> extends \mirzaev\yii2\arangodb\Migration
 {
     public function up()
     {