Commit 32d07689 by AlexGx

style fixes with phpcs:yii2

parent 34db2d20
<?php
namespace yiiunit;
use yii\helpers\ArrayHelper;
/**
......
......@@ -48,7 +48,7 @@ class Customer extends ActiveRecord
{
/** @var ActiveQuery $rel */
$rel = $this->hasMany(Item::className(), ['id' => 'item_id']);
return $rel->viaTable('tbl_order_item', ['order_id' => 'id'], function($q) {
return $rel->viaTable('tbl_order_item', ['order_id' => 'id'], function ($q) {
/** @var ActiveQuery $q */
$q->viaTable('tbl_order', ['customer_id' => 'id']);
})->orderBy('id');
......
<?php
namespace yiiunit\data\ar;
use yii\db\ActiveQuery;
/**
......@@ -13,4 +15,3 @@ class CustomerQuery extends ActiveQuery
return $this;
}
}
\ No newline at end of file
......@@ -18,5 +18,4 @@ class Profile extends ActiveRecord
{
return 'tbl_profile';
}
}
\ No newline at end of file
}
<?php
namespace yiiunit\data\ar\elasticsearch;
use yii\elasticsearch\ActiveQuery;
/**
......@@ -13,4 +15,3 @@ class CustomerQuery extends ActiveQuery
return $this;
}
}
\ No newline at end of file
<?php
namespace yiiunit\data\ar\elasticsearch;
use yii\elasticsearch\Command;
/**
......
<?php
namespace yiiunit\data\ar\elasticsearch;
use yii\elasticsearch\Command;
/**
......
<?php
namespace yiiunit\data\ar\elasticsearch;
use yii\elasticsearch\Command;
/**
......
......@@ -13,4 +13,4 @@ class ActiveRecord extends \yii\mongodb\ActiveRecord
{
return self::$db;
}
}
\ No newline at end of file
}
......@@ -30,4 +30,4 @@ class Customer extends ActiveRecord
$config['modelClass'] = get_called_class();
return new CustomerQuery($config);
}
}
\ No newline at end of file
}
......@@ -24,4 +24,4 @@ class CustomerOrder extends ActiveRecord
{
return $this->hasOne(Customer::className(), ['_id' => 'customer_id']);
}
}
\ No newline at end of file
}
<?php
namespace yiiunit\data\ar\mongodb;
use yii\mongodb\ActiveQuery;
/**
......@@ -13,4 +15,3 @@ class CustomerQuery extends ActiveQuery
return $this;
}
}
\ No newline at end of file
......@@ -13,4 +13,4 @@ class ActiveRecord extends \yii\mongodb\file\ActiveRecord
{
return self::$db;
}
}
\ No newline at end of file
}
......@@ -25,4 +25,4 @@ class CustomerFile extends ActiveRecord
$config['modelClass'] = get_called_class();
return new CustomerFileQuery($config);
}
}
\ No newline at end of file
}
<?php
namespace yiiunit\data\ar\mongodb\file;
use yii\mongodb\file\ActiveQuery;
/**
......@@ -13,4 +15,3 @@ class CustomerFileQuery extends ActiveQuery
return $this;
}
}
\ No newline at end of file
......@@ -21,4 +21,4 @@ class ActiveRecord extends \yii\redis\ActiveRecord
{
return self::$db;
}
}
\ No newline at end of file
}
<?php
namespace yiiunit\data\ar\redis;
use yii\redis\ActiveQuery;
/**
......@@ -13,4 +15,3 @@ class CustomerQuery extends ActiveQuery
return $this;
}
}
\ No newline at end of file
......@@ -8,4 +8,4 @@ class Item extends ActiveRecord
{
return ['id', 'name', 'category_id'];
}
}
\ No newline at end of file
}
......@@ -22,7 +22,7 @@ class Order extends ActiveRecord
public function getItems()
{
return $this->hasMany(Item::className(), ['id' => 'item_id'])
->via('orderItems', function($q) {
->via('orderItems', function ($q) {
// additional query configuration
});
}
......
......@@ -23,4 +23,4 @@ class OrderItem extends ActiveRecord
{
return $this->hasOne(Item::className(), ['id' => 'item_id']);
}
}
\ No newline at end of file
}
......@@ -13,4 +13,4 @@ class ActiveRecord extends \yii\sphinx\ActiveRecord
{
return self::$db;
}
}
\ No newline at end of file
}
......@@ -22,4 +22,4 @@ class ArticleDb extends ActiveRecordDb
];
return new ActiveQuery($config);
}
}
\ No newline at end of file
}
......@@ -30,4 +30,4 @@ class ArticleIndex extends ActiveRecord
$config['modelClass'] = get_called_class();
return new ArticleIndexQuery($config);
}
}
\ No newline at end of file
}
<?php
namespace yiiunit\data\ar\sphinx;
use yii\sphinx\ActiveQuery;
/**
......@@ -13,4 +15,3 @@ class ArticleIndexQuery extends ActiveQuery
return $this;
}
}
\ No newline at end of file
......@@ -10,4 +10,4 @@ class ItemDb extends ActiveRecordDb
{
return 'yii2_test_item';
}
}
\ No newline at end of file
}
......@@ -8,4 +8,4 @@ class ItemIndex extends ActiveRecord
{
return 'yii2_test_item_index';
}
}
\ No newline at end of file
}
......@@ -8,4 +8,4 @@ class RuntimeIndex extends ActiveRecord
{
return 'yii2_test_rt_index';
}
}
\ No newline at end of file
}
......@@ -9,4 +9,4 @@ class TagDb extends ActiveRecordDb
{
return 'yii2_test_tag';
}
}
\ No newline at end of file
}
......@@ -6,4 +6,4 @@ return [
'The dog runs fast.' => 'Der Hund rennt schnell.',
'His speed is about {n} km/h.' => 'Seine Geschwindigkeit beträgt {n} km/h.',
'His name is {name} and his speed is about {n, number} km/h.' => 'Er heißt {name} und ist {n, number} km/h schnell.',
];
\ No newline at end of file
];
......@@ -4,4 +4,4 @@
*/
return [
'Hello world!' => 'Hallo Welt!',
];
\ No newline at end of file
];
......@@ -4,4 +4,4 @@
*/
return [
'The dog runs fast.' => 'Der Hund rennt schell.',
];
\ No newline at end of file
];
......@@ -4,4 +4,4 @@
*/
return [
'The dog runs fast.' => 'Собака бегает быстро.',
];
\ No newline at end of file
];
......@@ -41,4 +41,4 @@ class TestValidator extends Validator
{
$this->_setErrorOnValidateAttribute = true;
}
}
\ No newline at end of file
}
......@@ -18,4 +18,4 @@ class ValidatorTestMainModel extends ActiveRecord
{
return $this->hasMany(ValidatorTestRefModel::className(), ['ref' => 'id']);
}
}
\ No newline at end of file
}
......@@ -20,4 +20,4 @@ class ValidatorTestRefModel extends ActiveRecord
{
return $this->hasOne(ValidatorTestMainModel::className(), ['id' => 'ref']);
}
}
\ No newline at end of file
}
......@@ -65,4 +65,4 @@ class AuthActionTest extends TestCase
$this->assertContains($url, $response->content);
}
}
\ No newline at end of file
}
......@@ -79,4 +79,4 @@ class BaseClientTest extends TestCase
class Client extends BaseClient
{
}
\ No newline at end of file
}
......@@ -81,4 +81,4 @@ class CollectionTest extends TestCase
class TestClient extends BaseClient
{
}
\ No newline at end of file
}
......@@ -100,7 +100,8 @@ class OAuth1Test extends TestCase
$this->assertEquals($expectedAuthorizationHeader, $authorizationHeader);
}
public function testBuildAuthUrl() {
public function testBuildAuthUrl()
{
$oauthClient = new OAuth1();
$authUrl = 'http://test.auth.url';
$oauthClient->authUrl = $authUrl;
......
......@@ -58,4 +58,4 @@ class OpenIdTest extends TestCase
$this->assertArrayHasKey('ax', $info);
$this->assertArrayHasKey('sreg', $info);
}
}
\ No newline at end of file
}
......@@ -130,4 +130,4 @@ class TokenTest extends TestCase
$oauthToken->createTimestamp = $oauthToken->createTimestamp - ($expireDuration +1);
$this->assertFalse($oauthToken->getIsValid(), 'Expired token is valid!');
}
}
\ No newline at end of file
}
......@@ -47,4 +47,4 @@ class BaseMethodTest extends TestCase
$generatedSignature = $signatureMethod->generateSignature($baseString, $key);
$this->assertTrue($signatureMethod->verify($generatedSignature, $baseString, $key), 'Generated signature is invalid!');
}
}
\ No newline at end of file
}
......@@ -17,4 +17,4 @@ class HmacSha1Test extends TestCase
$signature = $signatureMethod->generateSignature($baseString, $key);
$this->assertNotEmpty($signature, 'Unable to generate signature!');
}
}
\ No newline at end of file
}
......@@ -17,4 +17,4 @@ class PlainTextTest extends TestCase
$signature = $signatureMethod->generateSignature($baseString, $key);
$this->assertNotEmpty($signature, 'Unable to generate signature!');
}
}
\ No newline at end of file
}
......@@ -107,4 +107,4 @@ IyvuagHJR379p4dePwJBAMCkYSATGdhYbeDfySWUro5K0QAvBNj8FuNJQ4rqUxz8
$signatureMethod->publicCertificateFile = $certificateFileName;
$this->assertEquals(file_get_contents($certificateFileName), $signatureMethod->getPublicCertificate(), 'Unable to fetch public certificate from file!');
}
}
\ No newline at end of file
}
......@@ -20,15 +20,45 @@ class ActiveRecordTest extends ElasticSearchTestCase
{
use ActiveRecordTestTrait;
public function callCustomerFind($q = null) { return Customer::find($q); }
public function callOrderFind($q = null) { return Order::find($q); }
public function callOrderItemFind($q = null) { return OrderItem::find($q); }
public function callItemFind($q = null) { return Item::find($q); }
public function callCustomerFind($q = null)
{
return Customer::find($q);
}
public function callOrderFind($q = null)
{
return Order::find($q);
}
public function callOrderItemFind($q = null)
{
return OrderItem::find($q);
}
public function getCustomerClass() { return Customer::className(); }
public function getItemClass() { return Item::className(); }
public function getOrderClass() { return Order::className(); }
public function getOrderItemClass() { return OrderItem::className(); }
public function callItemFind($q = null)
{
return Item::find($q);
}
public function getCustomerClass()
{
return Customer::className();
}
public function getItemClass()
{
return Item::className();
}
public function getOrderClass()
{
return Order::className();
}
public function getOrderItemClass()
{
return OrderItem::className();
}
/**
* can be overridden to do things after save()
......@@ -224,7 +254,7 @@ class ActiveRecordTest extends ElasticSearchTestCase
$records = Customer::mget([5]);
$this->assertEquals(0, count($records));
$records = Customer::mget([1,3,5]);
$records = Customer::mget([1, 3, 5]);
$this->assertEquals(2, count($records));
$this->assertInstanceOf(Customer::className(), $records[0]);
$this->assertInstanceOf(Customer::className(), $records[1]);
......@@ -501,7 +531,7 @@ class ActiveRecordTest extends ElasticSearchTestCase
$customerClass = $this->getCustomerClass();
$afterFindCalls = [];
Event::on(BaseActiveRecord::className(), BaseActiveRecord::EVENT_AFTER_FIND, function($event) use (&$afterFindCalls) {
Event::on(BaseActiveRecord::className(), BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {
/** @var BaseActiveRecord $ar */
$ar = $event->sender;
$afterFindCalls[] = [get_class($ar), $ar->getIsNewRecord(), $ar->getPrimaryKey(), $ar->isRelationPopulated('orders')];
......@@ -523,6 +553,5 @@ class ActiveRecordTest extends ElasticSearchTestCase
Event::off(BaseActiveRecord::className(), BaseActiveRecord::EVENT_AFTER_FIND);
}
// TODO test AR with not mapped PK
}
......@@ -24,5 +24,4 @@ class ElasticSearchConnectionTest extends ElasticSearchTestCase
$this->assertArrayHasKey('version', reset($connection->nodes));
$this->assertArrayHasKey('http_address', reset($connection->nodes));
}
}
\ No newline at end of file
}
......@@ -74,4 +74,3 @@ class QueryBuilderTest extends ElasticSearchTestCase
$this->assertEquals(3, $result['hits']['total']);
}
}
......@@ -26,5 +26,4 @@ class ImageGdTest extends AbstractImageTest
$infos = gd_info();
return isset($infos['FreeType Support']) ? $infos['FreeType Support'] : false;
}
}
......@@ -26,5 +26,4 @@ class ImageGmagickTest extends AbstractImageTest
{
return true;
}
}
......@@ -26,5 +26,4 @@ class ImageImagickTest extends AbstractImageTest
{
return true;
}
}
......@@ -88,4 +88,4 @@ class ActiveDataProviderTest extends MongoDbTestCase
$models = $provider->getModels();
$this->assertEquals(5, count($models));
}
}
\ No newline at end of file
}
......@@ -263,4 +263,4 @@ class ActiveRecordTest extends MongoDbTestCase
$this->assertNotEmpty($rowRefreshed);
$this->assertEquals(7, $rowRefreshed->status);
}
}
\ No newline at end of file
}
......@@ -132,4 +132,4 @@ class CacheTest extends MongoDbTestCase
$this->assertEquals(false, $cache->get($key), 'Expired key value returned!');
}
}
\ No newline at end of file
}
......@@ -419,4 +419,4 @@ class CollectionTest extends MongoDbTestCase
$this->assertNotEmpty($result);
$this->assertCount(2, $result);
}
}
\ No newline at end of file
}
......@@ -116,4 +116,4 @@ class ConnectionTest extends MongoDbTestCase
$collection2 = $connection->getFileCollection('testfs', true);
$this->assertFalse($collection === $collection2);
}
}
\ No newline at end of file
}
......@@ -67,4 +67,4 @@ class DatabaseTest extends MongoDbTestCase
$collection = $database->createCollection('customer');
$this->assertTrue($collection instanceof \MongoCollection);
}
}
\ No newline at end of file
}
......@@ -141,4 +141,4 @@ class QueryRunTest extends MongoDbTestCase
$this->assertEquals('name1', $rows[0]['name']);
$this->assertEquals('name10', $rows[1]['name']);
}
}
\ No newline at end of file
}
......@@ -94,4 +94,4 @@ class QueryTest extends MongoDbTestCase
$this->assertEquals(10, $query->limit);
$this->assertEquals(5, $query->offset);
}
}
\ No newline at end of file
}
......@@ -137,4 +137,4 @@ class SessionTest extends MongoDbTestCase
$rows = $this->findAll($collection);
$this->assertCount(1, $rows, 'Wrong records count!');
}
}
\ No newline at end of file
}
......@@ -320,4 +320,4 @@ class ActiveRecordTest extends MongoDbTestCase
fclose($fileResource);
$this->assertEquals($newFileContent, $contents);
}
}
\ No newline at end of file
}
......@@ -95,4 +95,4 @@ class CollectionTest extends MongoDbTestCase
$file = $collection->get($id);
$this->assertNull($file);
}
}
\ No newline at end of file
}
......@@ -67,4 +67,4 @@ class QueryTest extends MongoDbTestCase
$file = $rows[0];
$this->assertEquals('name5', $file['filename']);
}
}
\ No newline at end of file
}
......@@ -16,15 +16,45 @@ class ActiveRecordTest extends RedisTestCase
{
use ActiveRecordTestTrait;
public function callCustomerFind($q = null) { return Customer::find($q); }
public function callOrderFind($q = null) { return Order::find($q); }
public function callOrderItemFind($q = null) { return OrderItem::find($q); }
public function callItemFind($q = null) { return Item::find($q); }
public function callCustomerFind($q = null)
{
return Customer::find($q);
}
public function callOrderFind($q = null)
{
return Order::find($q);
}
public function callOrderItemFind($q = null)
{
return OrderItem::find($q);
}
public function callItemFind($q = null)
{
return Item::find($q);
}
public function getCustomerClass() { return Customer::className(); }
public function getItemClass() { return Item::className(); }
public function getOrderClass() { return Order::className(); }
public function getOrderItemClass() { return OrderItem::className(); }
public function getCustomerClass()
{
return Customer::className();
}
public function getItemClass()
{
return Item::className();
}
public function getOrderClass()
{
return Order::className();
}
public function getOrderItemClass()
{
return OrderItem::className();
}
public function setUp()
......@@ -207,7 +237,7 @@ class ActiveRecordTest extends RedisTestCase
public function testFindColumn()
{
$this->assertEquals(['user1', 'user2', 'user3'], Customer::find()->column('name'));
// TODO $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['name' => SORT_DESC])->column('name'));
// TODO $this->assertEquals(['user3', 'user2', 'user1'], Customer::find()->orderBy(['name' => SORT_DESC])->column('name'));
}
// TODO test serial column incr
......
......@@ -97,5 +97,4 @@ class RedisCacheTest extends CacheTestCase
$cache->set($key, $data);
$this->assertTrue($cache->get($key) === $data);
}
}
......@@ -67,4 +67,4 @@ class ViewRendererTest extends TestCase
'baseUrl' => '/assets',
]);
}
}
\ No newline at end of file
}
......@@ -63,4 +63,4 @@ class ActiveDataProviderTest extends SphinxTestCase
$models = $provider->getModels();
$this->assertEquals(1, count($models));
}
}
\ No newline at end of file
}
......@@ -234,4 +234,4 @@ class ActiveRecordTest extends SphinxTestCase
$this->assertArrayHasKey('tokenized', $rows[0], 'No tokenized keyword!');
$this->assertArrayHasKey('normalized', $rows[0], 'No normalized keyword!');
}
}
\ No newline at end of file
}
......@@ -52,4 +52,4 @@ class ColumnSchemaTest extends SphinxTestCase
$columnSchema->phpType = $phpType;
$this->assertEquals($expectedResult, $columnSchema->typecast($value));
}
}
\ No newline at end of file
}
......@@ -222,7 +222,7 @@ class CommandTest extends SphinxTestCase
$this->assertEquals(1, count($rows), 'No row inserted!');
$newTypeId = 5;
$command = $db->createCommand()->replace('yii2_test_rt_index',[
$command = $db->createCommand()->replace('yii2_test_rt_index', [
'type_id' => $newTypeId,
'category' => [3, 4],
'id' => 1,
......@@ -272,7 +272,7 @@ class CommandTest extends SphinxTestCase
$this->assertEquals(2, count($rows), 'No rows inserted!');
$newTypeId = 5;
$command = $db->createCommand()->replace('yii2_test_rt_index',[
$command = $db->createCommand()->replace('yii2_test_rt_index', [
'type_id' => $newTypeId,
'id' => 1,
]);
......@@ -406,4 +406,4 @@ class CommandTest extends SphinxTestCase
$this->assertArrayHasKey('docs', $rows[0], 'No docs!');
$this->assertArrayHasKey('hits', $rows[0], 'No hits!');
}
}
\ No newline at end of file
}
......@@ -39,4 +39,4 @@ class ConnectionTest extends SphinxTestCase
$this->setExpectedException('yii\db\Exception');
$connection->open();
}
}
\ No newline at end of file
}
......@@ -161,7 +161,7 @@ class QueryTest extends SphinxTestCase
$match = 'about';
$snippetPrefix = 'snippet#';
$snippetCallback = function() use ($match, $snippetPrefix) {
$snippetCallback = function () use ($match, $snippetPrefix) {
return [
$snippetPrefix . '1: ' . $match,
$snippetPrefix . '2: ' . $match,
......@@ -195,4 +195,4 @@ class QueryTest extends SphinxTestCase
->count('*', $connection);
$this->assertEquals(2, $count);
}
}
\ No newline at end of file
}
......@@ -80,4 +80,4 @@ class SchemaTest extends SphinxTestCase
$this->assertEquals('rt', $index->type);
$this->assertTrue($index->isRuntime);
}
}
\ No newline at end of file
}
......@@ -71,4 +71,4 @@ class ViewRendererTest extends TestCase
'baseUrl' => '/assets',
]);
}
}
\ No newline at end of file
}
......@@ -356,11 +356,11 @@ trait ActiveRecordTestTrait
$this->assertEquals(2, $this->callCustomerFind()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->count());
$this->assertEquals(2, count($this->callCustomerFind()->where(['OR', ['name' => 'user1'], ['name' => 'user2']])->all()));
$this->assertEquals(2, $this->callCustomerFind()->where(['name' => ['user1','user2']])->count());
$this->assertEquals(2, count($this->callCustomerFind()->where(['name' => ['user1','user2']])->all()));
$this->assertEquals(2, $this->callCustomerFind()->where(['name' => ['user1', 'user2']])->count());
$this->assertEquals(2, count($this->callCustomerFind()->where(['name' => ['user1', 'user2']])->all()));
$this->assertEquals(1, $this->callCustomerFind()->where(['AND', ['name' => ['user2','user3']], ['BETWEEN', 'status', 2, 4]])->count());
$this->assertEquals(1, count($this->callCustomerFind()->where(['AND', ['name' => ['user2','user3']], ['BETWEEN', 'status', 2, 4]])->all()));
$this->assertEquals(1, $this->callCustomerFind()->where(['AND', ['name' => ['user2', 'user3']], ['BETWEEN', 'status', 2, 4]])->count());
$this->assertEquals(1, count($this->callCustomerFind()->where(['AND', ['name' => ['user2', 'user3']], ['BETWEEN', 'status', 2, 4]])->all()));
}
public function testFindNullValues()
......@@ -384,9 +384,9 @@ trait ActiveRecordTestTrait
$this->assertTrue($this->callCustomerFind()->where(['name' => 'user1'])->exists());
$this->assertFalse($this->callCustomerFind()->where(['name' => 'user5'])->exists());
$this->assertTrue($this->callCustomerFind()->where(['id' => [2,3]])->exists());
$this->assertTrue($this->callCustomerFind()->where(['id' => [2,3]])->offset(1)->exists());
$this->assertFalse($this->callCustomerFind()->where(['id' => [2,3]])->offset(2)->exists());
$this->assertTrue($this->callCustomerFind()->where(['id' => [2, 3]])->exists());
$this->assertTrue($this->callCustomerFind()->where(['id' => [2, 3]])->offset(1)->exists());
$this->assertFalse($this->callCustomerFind()->where(['id' => [2, 3]])->offset(2)->exists());
}
public function testFindLazy()
......@@ -854,7 +854,7 @@ trait ActiveRecordTestTrait
/** @var TestCase|ActiveRecordTestTrait $this */
$afterFindCalls = [];
Event::on(BaseActiveRecord::className(), BaseActiveRecord::EVENT_AFTER_FIND, function($event) use (&$afterFindCalls) {
Event::on(BaseActiveRecord::className(), BaseActiveRecord::EVENT_AFTER_FIND, function ($event) use (&$afterFindCalls) {
/** @var BaseActiveRecord $ar */
$ar = $event->sender;
$afterFindCalls[] = [get_class($ar), $ar->getIsNewRecord(), $ar->getPrimaryKey(), $ar->isRelationPopulated('orders')];
......
......@@ -102,5 +102,4 @@ class BehaviorTest extends TestCase
$bar->attachBehavior('bar', $behavior);
$bar->nomagicBehaviorMethod();
}
}
......@@ -89,5 +89,4 @@ class Post extends ActiveRecord
class User extends ActiveRecord
{
}
......@@ -24,15 +24,45 @@ class ActiveRecordTest extends DatabaseTestCase
ActiveRecord::$db = $this->getConnection();
}
public function callCustomerFind($q = null) { return Customer::find($q); }
public function callOrderFind($q = null) { return Order::find($q); }
public function callOrderItemFind($q = null) { return OrderItem::find($q); }
public function callItemFind($q = null) { return Item::find($q); }
public function callCustomerFind($q = null)
{
return Customer::find($q);
}
public function callOrderFind($q = null)
{
return Order::find($q);
}
public function callOrderItemFind($q = null)
{
return OrderItem::find($q);
}
public function getCustomerClass() { return Customer::className(); }
public function getItemClass() { return Item::className(); }
public function getOrderClass() { return Order::className(); }
public function getOrderItemClass() { return OrderItem::className(); }
public function callItemFind($q = null)
{
return Item::find($q);
}
public function getCustomerClass()
{
return Customer::className();
}
public function getItemClass()
{
return Item::className();
}
public function getOrderClass()
{
return Order::className();
}
public function getOrderItemClass()
{
return OrderItem::className();
}
public function testCustomColumns()
{
......@@ -284,7 +314,7 @@ class ActiveRecordTest extends DatabaseTestCase
$orders = Order::find()->innerJoinWith([
'customer' => function ($query) {
$query->where(['tbl_customer.id' => 2]);
},
},
], false)->where(['tbl_order.id' => [1, 2]])->orderBy('tbl_order.id')->all();
$this->assertEquals(1, count($orders));
$this->assertEquals(2, $orders[0]->id);
......
......@@ -239,5 +239,4 @@ class QueryBuilderTest extends DatabaseTestCase
list($actualQuerySql, $queryParams) = $this->getQueryBuilder()->build($query);
$this->assertEquals($expectedQuerySql, $actualQuerySql);
}*/
}
......@@ -79,5 +79,4 @@ class CubridQueryBuilderTest extends QueryBuilderTest
[Schema::TYPE_MONEY . ' NOT NULL', 'decimal(19,4) NOT NULL'],
];
}
}
......@@ -12,49 +12,46 @@ use yii\db\Query;
class MSSQLQueryBuilderTest extends QueryBuilderTest
{
public $driverName = 'sqlsrv';
public function testOffsetLimit() {
$expectedQuerySql = 'SELECT `id` FROM `exapmle` OFFSET 5 ROWS FETCH NEXT 10 ROWS ONLY';
$expectedQueryParams = null;
$query = new Query();
$query->select('id')
->from('example')
->limit(10)->offset(5);
list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query);
$this->assertEquals($expectedQuerySql, $actualQuerySql);
$this->assertEquals($expectedQueryParams, $actualQueryParams);
}
public function testLimit() {
$expectedQuerySql = 'SELECT `id` FROM `exapmle` OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY';
$expectedQueryParams = null;
$query = new Query();
$query->select('id')
->from('example')
->limit(10);
list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query);
$this->assertEquals($expectedQuerySql, $actualQuerySql);
$this->assertEquals($expectedQueryParams, $actualQueryParams);
}
public function testOffset() {
$expectedQuerySql = 'SELECT `id` FROM `exapmle` OFFSET 10 ROWS';
$expectedQueryParams = null;
$query = new Query();
$query->select('id')
->from('example')
->offset(10);
list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query);
$this->assertEquals($expectedQuerySql, $actualQuerySql);
$this->assertEquals($expectedQueryParams, $actualQueryParams);
}
}
\ No newline at end of file
public function testOffsetLimit()
{
$expectedQuerySql = 'SELECT `id` FROM `exapmle` OFFSET 5 ROWS FETCH NEXT 10 ROWS ONLY';
$expectedQueryParams = null;
$query = new Query();
$query->select('id')->from('example')->limit(10)->offset(5);
list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query);
$this->assertEquals($expectedQuerySql, $actualQuerySql);
$this->assertEquals($expectedQueryParams, $actualQueryParams);
}
public function testLimit()
{
$expectedQuerySql = 'SELECT `id` FROM `exapmle` OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY';
$expectedQueryParams = null;
$query = new Query();
$query->select('id')->from('example')->limit(10);
list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query);
$this->assertEquals($expectedQuerySql, $actualQuerySql);
$this->assertEquals($expectedQueryParams, $actualQueryParams);
}
public function testOffset()
{
$expectedQuerySql = 'SELECT `id` FROM `exapmle` OFFSET 10 ROWS';
$expectedQueryParams = null;
$query = new Query();
$query->select('id')->from('example')->offset(10);
list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query);
$this->assertEquals($expectedQuerySql, $actualQuerySql);
$this->assertEquals($expectedQueryParams, $actualQueryParams);
}
}
......@@ -84,7 +84,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest
public function testBatchInsert()
{
$sql = $this->getQueryBuilder()->batchInsert('{{tbl_customer}} t', ['t.id','t.name'], [[1,'a'], [2,'b']]);
$sql = $this->getQueryBuilder()->batchInsert('{{tbl_customer}} t', ['t.id', 't.name'], [[1, 'a'], [2, 'b']]);
$this->assertEquals("INSERT INTO {{tbl_customer}} t (`t`.`id`, `t`.`name`) SELECT 1, 'a' UNION ALL 2, 'b'", $sql);
}
}
......@@ -255,16 +255,20 @@ class FileHelperTest extends TestCase
{
$basePath = $this->testFilePath . DIRECTORY_SEPARATOR;
$dirs = ['', 'one', 'one' . DIRECTORY_SEPARATOR . 'two', 'three'];
$files = array_fill_keys(array_map(function($n){return "a.$n";}, range(1,8)), 'file contents');
$files = array_fill_keys(array_map(function ($n) {
return "a.$n";
}, range(1, 8)), 'file contents');
$tree = $files;
$root = $files;
$flat = [];
foreach ($dirs as $dir) {
foreach ($files as $fileName => $contents) {
$flat[] = rtrim($basePath.$dir,DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$fileName;
$flat[] = rtrim($basePath . $dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $fileName;
}
if ($dir === '') {
continue;
}
if ($dir === '') continue;
$parts = explode(DIRECTORY_SEPARATOR, $dir);
$last = array_pop($parts);
$parent = array_pop($parts);
......@@ -280,25 +284,31 @@ class FileHelperTest extends TestCase
// range
$foundFiles = FileHelper::findFiles($basePath, ['except' => ['a.[2-8]']]);
sort($foundFiles);
$expect = array_values(array_filter($flat, function($p){return substr($p, -3)==='a.1';}));
$expect = array_values(array_filter($flat, function ($p) {
return substr($p, -3)==='a.1';
}));
$this->assertEquals($expect, $foundFiles);
// suffix
$foundFiles = FileHelper::findFiles($basePath, ['except' => ['*.1']]);
sort($foundFiles);
$expect = array_values(array_filter($flat, function($p){return substr($p, -3)!=='a.1';}));
$expect = array_values(array_filter($flat, function ($p) {
return substr($p, -3)!=='a.1';
}));
$this->assertEquals($expect, $foundFiles);
// dir
$foundFiles = FileHelper::findFiles($basePath, ['except' => ['/one']]);
sort($foundFiles);
$expect = array_values(array_filter($flat, function($p){return strpos($p, DIRECTORY_SEPARATOR.'one')===false;}));
$expect = array_values(array_filter($flat, function ($p) {
return strpos($p, DIRECTORY_SEPARATOR.'one')===false;
}));
$this->assertEquals($expect, $foundFiles);
// dir contents
$foundFiles = FileHelper::findFiles($basePath, ['except' => ['?*/a.1']]);
sort($foundFiles);
$expect = array_values(array_filter($flat, function($p){
$expect = array_values(array_filter($flat, function ($p) {
return substr($p, -11, 10)==='one'.DIRECTORY_SEPARATOR.'two'.DIRECTORY_SEPARATOR.'a.' || (
substr($p, -8)!==DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'a.1' &&
substr($p, -10)!==DIRECTORY_SEPARATOR.'three'.DIRECTORY_SEPARATOR.'a.1'
......
......@@ -213,7 +213,7 @@ class HtmlTest extends TestCase
{
$this->assertEquals('<input type="radio" name="test" value="1">', Html::radio('test'));
$this->assertEquals('<input type="radio" class="a" name="test" checked>', Html::radio('test', true, ['class' => 'a', 'value' => null]));
$this->assertEquals('<input type="hidden" name="test" value="0"><input type="radio" class="a" name="test" value="2" checked>', Html::radio('test', true, ['class' => 'a' , 'uncheck' => '0', 'value' => 2]));
$this->assertEquals('<input type="hidden" name="test" value="0"><input type="radio" class="a" name="test" value="2" checked>', Html::radio('test', true, ['class' => 'a', 'uncheck' => '0', 'value' => 2]));
$this->assertEquals('<div class="radio"><label class="bbb"><input type="radio" class="a" name="test" checked> ccc</label></div>', Html::radio('test', true, [
'class' => 'a',
......
......@@ -97,7 +97,7 @@ _MSG_
[
'name' => 'Alexander',
'gender' => 'male',
// following should not be replaced
// following should not be replaced
'he' => 'wtf',
'she' => 'wtf',
'it' => 'wtf',
......
......@@ -105,13 +105,13 @@ class I18NTest extends TestCase
$this->assertEquals('Missing translation message.', $this->i18n->translate('test', 'Missing translation message.', [], 'de-DE'));
$this->assertEquals('Hallo Welt!', $this->i18n->translate('test', 'Hello world!', [], 'de-DE'));
Event::on(PhpMessageSource::className(), PhpMessageSource::EVENT_MISSING_TRANSLATION, function($event) {});
Event::on(PhpMessageSource::className(), PhpMessageSource::EVENT_MISSING_TRANSLATION, function ($event) {});
$this->assertEquals('Hallo Welt!', $this->i18n->translate('test', 'Hello world!', [], 'de-DE'));
$this->assertEquals('Missing translation message.', $this->i18n->translate('test', 'Missing translation message.', [], 'de-DE'));
$this->assertEquals('Hallo Welt!', $this->i18n->translate('test', 'Hello world!', [], 'de-DE'));
Event::off(PhpMessageSource::className(), PhpMessageSource::EVENT_MISSING_TRANSLATION);
Event::on(PhpMessageSource::className(), PhpMessageSource::EVENT_MISSING_TRANSLATION, function($event) {
Event::on(PhpMessageSource::className(), PhpMessageSource::EVENT_MISSING_TRANSLATION, function ($event) {
if ($event->message == 'New missing translation message.') {
$event->translatedMessage = 'TRANSLATION MISSING HERE!';
}
......@@ -124,4 +124,3 @@ class I18NTest extends TestCase
Event::off(PhpMessageSource::className(), PhpMessageSource::EVENT_MISSING_TRANSLATION);
}
}
......@@ -28,4 +28,4 @@ class LoggerTest extends TestCase
$this->assertEquals(Logger::LEVEL_ERROR, $logger->messages[1][1]);
$this->assertEquals('category', $logger->messages[1][2]);
}
}
\ No newline at end of file
}
......@@ -85,4 +85,4 @@ class TestTarget extends Target
TargetTest::$messages = array_merge(TargetTest::$messages, $this->messages);
$this->messages = [];
}
}
\ No newline at end of file
}
......@@ -235,12 +235,11 @@ class BaseMailerTest extends TestCase
{
$message = new Message();
$mailerMock = $this->getMockBuilder('yiiunit\framework\mail\Mailer')->setMethods(['beforeSend','afterSend'])->getMock();
$mailerMock = $this->getMockBuilder('yiiunit\framework\mail\Mailer')->setMethods(['beforeSend', 'afterSend'])->getMock();
$mailerMock->expects($this->once())->method('beforeSend')->with($message)->will($this->returnValue(true));
$mailerMock->expects($this->once())->method('afterSend')->with($message,true);
$mailerMock->expects($this->once())->method('afterSend')->with($message, true);
$mailerMock->send($message);
}
}
/**
......
......@@ -78,39 +78,62 @@ class TestMessage extends BaseMessage
public $text;
public $html;
public function getCharset() {return '';}
public function getCharset()
{
return '';
}
public function setCharset($charset) {}
public function getFrom() {return '';}
public function getFrom()
{
return '';
}
public function setFrom($from) {}
public function getReplyTo() {return '';}
public function getReplyTo()
{
return '';
}
public function setReplyTo($replyTo) {}
public function getTo() {return '';}
public function getTo()
{
return '';
}
public function setTo($to) {}
public function getCc() {return '';}
public function getCc()
{
return '';
}
public function setCc($cc) {}
public function getBcc() {return '';}
public function getBcc()
{
return '';
}
public function setBcc($bcc) {}
public function setBcc($bcc){}
public function getSubject() {return '';}
public function getSubject()
{
return '';
}
public function setSubject($subject) {}
public function setTextBody($text) {
public function setTextBody($text)
{
$this->text = $text;
}
public function setHtmlBody($html) {
public function setHtmlBody($html)
{
$this->html = $html;
}
......
......@@ -6,8 +6,6 @@ use yii\validators\CompareValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
class CompareValidatorTest extends TestCase
{
protected function setUp()
......
......@@ -7,7 +7,6 @@ use yii\validators\DateValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
class DateValidatorTest extends TestCase
{
protected function setUp()
......
<?php
namespace yiiunit\framework\validators;
use yii\validators\DefaultValueValidator;
use yiiunit\TestCase;
......
......@@ -7,4 +7,4 @@ use yiiunit\framework\validators\ExistValidatorTest;
class ExistValidatorPostgresTest extends ExistValidatorTest
{
protected $driverName = 'pgsql';
}
\ No newline at end of file
}
......@@ -7,4 +7,4 @@ use yiiunit\framework\validators\ExistValidatorTest;
class ExistValidatorSQliteTest extends ExistValidatorTest
{
protected $driverName = 'sqlite';
}
\ No newline at end of file
}
......@@ -49,4 +49,4 @@ class FilterValidatorTest extends TestCase
{
return 'not null';
}
}
\ No newline at end of file
}
......@@ -144,7 +144,7 @@ class NumberValidatorTest extends TestCase
$val->validateAttribute($model, 'attr_number');
$this->assertTrue($model->hasErrors('attr_number'));
$val = new NumberValidator(['min' => 1]);
$model = FakedValidationModel::createWithAttributes(['attr_num' => [1,2,3]]);
$model = FakedValidationModel::createWithAttributes(['attr_num' => [1, 2, 3]]);
$val->validateAttribute($model, 'attr_num');
$this->assertTrue($model->hasErrors('attr_num'));
}
......
......@@ -50,5 +50,4 @@ class RegularExpressionValidatorTest extends TestCase
$val = new RegularExpressionValidator();
$val->validate('abc');
}
}
......@@ -8,4 +8,4 @@ use yiiunit\framework\validators\UniqueValidatorTest;
class UniqueValidatorPostgresTest extends UniqueValidatorTest
{
protected $driverName = 'pgsql';
}
\ No newline at end of file
}
......@@ -8,4 +8,4 @@ use yiiunit\framework\validators\UniqueValidatorTest;
class UniqueValidatorSQliteTest extends UniqueValidatorTest
{
protected $driverName = 'sqlite';
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment