Skip to content

Commit

Permalink
changed namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
mice committed Apr 26, 2018
1 parent 4d9a7a5 commit 5967b8e
Show file tree
Hide file tree
Showing 27 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion ActiveDataProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\base\InvalidCallException;
use yii\base\InvalidConfigException;
Expand Down
2 changes: 1 addition & 1 deletion ActiveFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use Yii;
use yii\base\InvalidConfigException;
Expand Down
2 changes: 1 addition & 1 deletion ActiveQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\db\ActiveQueryInterface;
use yii\db\ActiveQueryTrait;
Expand Down
4 changes: 2 additions & 2 deletions ActiveRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use Yii;
use yii\base\InvalidArgumentException;
Expand Down Expand Up @@ -34,7 +34,7 @@
* The following is an example model called `Customer`:
*
* ```php
* class Customer extends \yii\elasticsearch\ActiveRecord
* class Customer extends \micetm\elasticsearch\ActiveRecord
* {
* public function attributes()
* {
Expand Down
2 changes: 1 addition & 1 deletion BatchQueryResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\base\BaseObject;

Expand Down
2 changes: 1 addition & 1 deletion BulkCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\base\Component;
use yii\base\InvalidCallException;
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Yii Framework 2 elasticsearch extension Change Log
- Bug: (CVE-2018-8074): Fixed possibility of manipulated condition when unfiltered input is passed to `ActiveRecord::findOne()` or `findAll()` (cebe)
- Bug: Updated debug panel classes to be consistent with yii 2.0.7 (beowulfenator)
- Bug: Added accessor method for the default elasticsearch primary key (kyle-mccarthy)
- Enh #15: Special data provider `yii\elasticsearch\ActiveDataProvider` created (klimov-paul)
- Enh #15: Special data provider `micetm\elasticsearch\ActiveDataProvider` created (klimov-paul)
- Enh #43: Elasticsearch log target (trntv, beowulfenator)
- Enh #47: Added support for post_filter option in search queries (mxkh)
- Enh #60: Minor updates to guide (devypt, beowulfenator)
Expand Down Expand Up @@ -111,7 +111,7 @@ Yii Framework 2 elasticsearch extension Change Log
- Enh #1313: made index and type available in `ActiveRecord::instantiate()` to allow creating records based on elasticsearch type when doing cross index/type search (cebe)
- Enh #1382: Added a debug toolbar panel for elasticsearch (cebe)
- Enh #1765: Added support for primary key path mapping, pk can now be part of the attributes when mapping is defined (cebe)
- Enh #2002: Added filterWhere() method to yii\elasticsearch\Query to allow easy addition of search filter conditions by ignoring empty search fields (samdark, cebe)
- Enh #2002: Added filterWhere() method to micetm\elasticsearch\Query to allow easy addition of search filter conditions by ignoring empty search fields (samdark, cebe)
- Enh #2892: ActiveRecord dirty attributes are now reset after call to `afterSave()` so information about changed attributes is available in `afterSave`-event (cebe)
- Chg #1765: Changed handling of ActiveRecord primary keys, removed getId(), use getPrimaryKey() instead (cebe)
- Chg #2281: Renamed `ActiveRecord::create()` to `populateRecord()` and changed signature. This method will not call instantiate() anymore (cebe)
Expand Down
2 changes: 1 addition & 1 deletion Command.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\base\Component;
use yii\base\InvalidCallException;
Expand Down
2 changes: 1 addition & 1 deletion Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use Yii;
use yii\base\Component;
Expand Down
2 changes: 1 addition & 1 deletion DebugAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\base\Action;
use yii\base\NotSupportedException;
Expand Down
4 changes: 2 additions & 2 deletions DebugPanel.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\debug\Panel;
use yii\helpers\ArrayHelper;
Expand Down Expand Up @@ -188,7 +188,7 @@ public function calculateTimings()
public function save()
{
$target = $this->module->logTarget;
$messages = $target->filterMessages($target->messages, Logger::LEVEL_PROFILE, ['yii\elasticsearch\Connection::httpRequest']);
$messages = $target->filterMessages($target->messages, Logger::LEVEL_PROFILE, ['micetm\elasticsearch\Connection::httpRequest']);

return ['messages' => $messages];
}
Expand Down
2 changes: 1 addition & 1 deletion ElasticsearchTarget.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use Yii;
use yii\base\InvalidConfigException;
Expand Down
2 changes: 1 addition & 1 deletion Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

/**
* Exception represents an exception that is caused by elasticsearch-related operations.
Expand Down
4 changes: 2 additions & 2 deletions Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use Yii;
use yii\base\Component;
Expand Down Expand Up @@ -601,7 +601,7 @@ public function from($index, $type = null)
* > The stored_fields parameter is about fields that are explicitly marked
* > as stored in the mapping, which is off by default and generally not recommended.
* > Use source filtering instead to select subsets of the original source document to be returned.
*
*
* @param array $fields the fields to be selected.
* @return $this the query object itself
* @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-stored-fields.html
Expand Down
2 changes: 1 addition & 1 deletion QueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/

namespace yii\elasticsearch;
namespace micetm\elasticsearch;

use yii\base\BaseObject;
use yii\base\InvalidParamException;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ return [
//....
'components' => [
'elasticsearch' => [
'class' => 'yii\elasticsearch\Connection',
'class' => 'micetm\elasticsearch\Connection',
'nodes' => [
['http_address' => '127.0.0.1:9200'],
// configure more hosts if you have a cluster
Expand Down
2 changes: 1 addition & 1 deletion docs/guide-fr/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ return [
//....
'components' => [
'elasticsearch' => [
'class' => 'yii\elasticsearch\Connection',
'class' => 'micetm\elasticsearch\Connection',
'nodes' => [
['http_address' => '127.0.0.1:9200'],
// configurez plus de serveurs si vous avez un cluster
Expand Down
6 changes: 3 additions & 3 deletions tests/ActiveDataProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace yiiunit\extensions\elasticsearch;

use yii\elasticsearch\ActiveDataProvider;
use yii\elasticsearch\Connection;
use yii\elasticsearch\Query;
use micetm\elasticsearch\ActiveDataProvider;
use micetm\elasticsearch\Connection;
use micetm\elasticsearch\Query;
use yiiunit\extensions\elasticsearch\data\ar\ActiveRecord;
use yiiunit\extensions\elasticsearch\data\ar\Customer;

Expand Down
4 changes: 2 additions & 2 deletions tests/ActiveRecordTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use yii\base\Event;
use yii\db\BaseActiveRecord;
use yii\elasticsearch\Connection;
use micetm\elasticsearch\Connection;
use yiiunit\framework\ar\ActiveRecordTestTrait;
use yiiunit\extensions\elasticsearch\data\ar\ActiveRecord;
use yiiunit\extensions\elasticsearch\data\ar\Customer;
Expand Down Expand Up @@ -190,7 +190,7 @@ public function setUp()

(new Cat())->save(false);
(new Dog())->save(false);

$db->createCommand()->flushIndex('yiitest');
}

Expand Down
2 changes: 1 addition & 1 deletion tests/CommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace yiiunit\extensions\elasticsearch;

use yii\elasticsearch\Connection;
use micetm\elasticsearch\Connection;

/**
* @group elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion tests/ConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace yiiunit\extensions\elasticsearch;

use yii\elasticsearch\Connection;
use micetm\elasticsearch\Connection;

/**
* @group elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion tests/ElasticSearchConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace yiiunit\extensions\elasticsearch;

use yii\elasticsearch\Connection;
use micetm\elasticsearch\Connection;

/**
* @group elasticsearch
Expand Down
4 changes: 2 additions & 2 deletions tests/ElasticsearchTargetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

namespace yiiunit\extensions\elasticsearch;

use yii\elasticsearch\ElasticsearchTarget;
use yii\elasticsearch\Query;
use micetm\elasticsearch\ElasticsearchTarget;
use micetm\elasticsearch\Query;
use yii\log\Dispatcher;
use yii\log\Logger;

Expand Down
4 changes: 2 additions & 2 deletions tests/QueryBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace yiiunit\extensions\elasticsearch;

use yii\elasticsearch\Query;
use yii\elasticsearch\QueryBuilder;
use micetm\elasticsearch\Query;
use micetm\elasticsearch\QueryBuilder;

/**
* @group elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion tests/QueryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace yiiunit\extensions\elasticsearch;

use yii\elasticsearch\Query;
use micetm\elasticsearch\Query;

/**
* @group elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace yiiunit\extensions\elasticsearch;

use yii\di\Container;
use yii\elasticsearch\Connection;
use micetm\elasticsearch\Connection;
use yii\helpers\ArrayHelper;
use Yii;

Expand Down
2 changes: 1 addition & 1 deletion tests/data/ar/ActiveRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
class ActiveRecord extends \yii\elasticsearch\ActiveRecord
class ActiveRecord extends \micetm\elasticsearch\ActiveRecord
{
public static $db;

Expand Down

0 comments on commit 5967b8e

Please sign in to comment.