Skip to content

Commit 78b77b0

Browse files
coderiuscoderius
committed
Fix worning in run tests 'Warning: count(): Parameter must be an array or an object that implements'
1 parent 9824b35 commit 78b77b0

File tree

7 files changed

+222
-13
lines changed

7 files changed

+222
-13
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"mockery/mockery": "^1.2"
2929
},
3030
"require-dev": {
31-
"phpunit/phpunit": "^5"
31+
"phpunit/phpunit": "4.8.27|^5.0|^6.0"
3232
},
3333
"autoload": {
3434
"psr-4": {

‎src/UploadFileBehavior.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
<?php
22
//UploadFileBehavior.php
33

4-
namespace coderius\yii2UploadFileBehavior\UploadFileBehavior;
4+
namespace coderius\yii2UploadFileBehavior;
55

66
use Closure;
77
use yii\base\Behavior;
88
use yii\db\ActiveRecord;
99
use yii\web\UploadedFile;
1010
use yii\helpers\FileHelper;
11-
use backend\models\blog\BlogArticles;
1211
use yii\base\InvalidCallException;
1312
use yii\base\InvalidArgumentException;
1413
use yii\base\InvalidConfigException;
1514
use yii\base\NotSupportedException;
15+
use yii\imagine\Image;
16+
use Imagine\Image\Point;
17+
use Imagine\Image\Box;
1618

1719
/**
1820
* UploadFileBehavior class
@@ -187,7 +189,8 @@ public function attach($owner)
187189
public function events()
188190
{
189191
return [
190-
BlogArticles::EVENT_BEFORE_VALIDATE => 'afterLoadHendler',
192+
ActiveRecord::EVENT_BEFORE_INSERT => 'loadFile',
193+
ActiveRecord::EVENT_BEFORE_INSERT => 'loadFile',
191194
ActiveRecord::EVENT_AFTER_INSERT => 'afterInsertHendler',
192195
ActiveRecord::EVENT_AFTER_UPDATE => 'afterUpdateHendler',
193196
];
@@ -199,7 +202,7 @@ public function events()
199202
* @param [type] $event
200203
* @return void
201204
*/
202-
public function afterLoadHendler($event)
205+
public function loadFile()
203206
{
204207
if($this->isFile()){
205208
$this->owner->file = $this->getFileInstance();//virtual attribute

‎tests/TestCase.php‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ protected function setUp(): void
1717
{
1818
parent::setUp();
1919
$this->mockWebApplication();
20+
$this->setupTestDbData();
2021
}
2122
/**
2223
* Clean up after test.
@@ -40,13 +41,18 @@ protected function mockWebApplication($config = [], $appClass = '\yii\web\Applic
4041
'aliases' => [
4142
'@bower' => '@vendor/bower',
4243
'@npm' => '@vendor/npm',
44+
'@uploadsPath' => '@tests/data/uploads',
4345
],
4446
'components' => [
4547
'request' => [
4648
'cookieValidationKey' => 'wefJDF8sfdsfSDefwqdxj9oq',
4749
'hostInfo' => 'http://domain.com',
4850
'scriptUrl' => 'index.php',
4951
],
52+
'db' => [
53+
'class' => 'yii\db\Connection',
54+
'dsn' => 'sqlite::memory:',
55+
],
5056
],
5157
], $config));
5258
}
@@ -102,4 +108,31 @@ protected function getVendorPath()
102108
{
103109
return dirname(__DIR__) . '/vendor';
104110
}
111+
112+
/**
113+
* Setup tables for test ActiveRecord
114+
*/
115+
protected function setupTestDbData()
116+
{
117+
$db = Yii::$app->getDb();
118+
119+
// Structure :
120+
121+
$table = 'article';
122+
$columns = [
123+
'id' => 'pk',
124+
'img_src' => 'string',
125+
'text' => 'string',
126+
];
127+
$db->createCommand()->createTable($table, $columns)->execute();
128+
129+
// Data :
130+
131+
$db->createCommand()->batchInsert('article', ['img_src', 'text'], [
132+
['image-1.jpg', '1 image text'],
133+
['image-2.jpg', '2 image text'],
134+
['image-3.jpg', '3 image text'],
135+
])->execute();
136+
137+
}
105138
}

‎tests/bootstrap.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@
1111

1212
require_once(__DIR__ . '/../vendor/autoload.php');
1313
require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
14-
Yii::setAlias('@tests', __DIR__);
14+
15+
Yii::setAlias('@tests', __DIR__);
16+
Yii::setAlias('@coderius/yii2UploadFileBehavior', __DIR__ . '/../src');

‎tests/compatibility.php‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php
2+
/*
3+
* Ensures compatibility with PHPUnit < 6.x
4+
*/
5+
6+
namespace PHPUnit\Framework\Constraint {
7+
if (!class_exists('PHPUnit\Framework\Constraint\Constraint') && class_exists('PHPUnit_Framework_Constraint')) {
8+
abstract class Constraint extends \PHPUnit_Framework_Constraint
9+
{
10+
}
11+
}
12+
}
13+
14+
namespace PHPUnit\Framework {
15+
if (!class_exists('PHPUnit\Framework\TestCase') && class_exists('PHPUnit_Framework_TestCase')) {
16+
abstract class TestCase extends \PHPUnit_Framework_TestCase
17+
{
18+
/**
19+
* @param string $exception
20+
*/
21+
public function expectException($exception)
22+
{
23+
$this->setExpectedException($exception);
24+
}
25+
26+
/**
27+
* @param string $message
28+
*/
29+
public function expectExceptionMessage($message)
30+
{
31+
$parentClassMethods = get_class_methods('PHPUnit_Framework_TestCase');
32+
if (in_array('expectExceptionMessage', $parentClassMethods)) {
33+
parent::expectExceptionMessage($message);
34+
return;
35+
}
36+
$this->setExpectedException($this->getExpectedException(), $message);
37+
}
38+
39+
/**
40+
* @param string $messageRegExp
41+
*/
42+
public function expectExceptionMessageRegExp($messageRegExp)
43+
{
44+
$parentClassMethods = get_class_methods('PHPUnit_Framework_TestCase');
45+
if (in_array('expectExceptionMessageRegExp', $parentClassMethods)) {
46+
parent::expectExceptionMessageRegExp($messageRegExp);
47+
return;
48+
}
49+
$this->setExpectedExceptionRegExp($this->getExpectedException(), $messageRegExp);
50+
}
51+
}
52+
}
53+
}

‎tests/data/model/Article.php‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?php
2+
3+
namespace tests\data\model;
4+
5+
use Yii;
6+
use yii\db\ActiveRecord;
7+
use yii\behaviors\BlameableBehavior;
8+
use coderius\yii2UploadFileBehavior\UploadFileBehavior;
9+
use yii\imagine\Image;
10+
use Imagine\Image\Point;
11+
use Imagine\Image\Box;
12+
/**
13+
* This is the model class for table "portfoleo_photo".
14+
*
15+
* @property int $id
16+
* @property string $img_src
17+
* @property string $text
18+
19+
*/
20+
class Article extends \yii\db\ActiveRecord
21+
{
22+
public $file;
23+
24+
/**
25+
* {@inheritdoc}
26+
*/
27+
public static function tableName()
28+
{
29+
return 'article';
30+
}
31+
32+
/**
33+
* @inheritdoc
34+
*/
35+
public function rules()
36+
{
37+
return [
38+
['text', 'required'],
39+
[['img_src'], 'safe'],
40+
];
41+
}
42+
43+
public function behaviors()
44+
{
45+
return [
46+
'uploadFileBehavior' => [
47+
'class' => UploadFileBehavior::className(),
48+
// 'nameOfAttributeStorage' => 'img_src',
49+
'directories' => [
50+
51+
[
52+
'path' => function($attributes){
53+
return \Yii::getAlias('@uploadsPath/' . $attributes['id'] . '/big/');
54+
},
55+
'hendler' => function($fileTempName, $newFilePath){
56+
Image::thumbnail($fileTempName, 900, 900*2/3)
57+
->copy()
58+
->crop(new Point(0, 0), new Box(900, 900*2/3))
59+
->save($newFilePath, ['quality' => 80]);
60+
sleep(1);
61+
}
62+
],
63+
[
64+
'path' => function($attributes){
65+
return \Yii::getAlias('@uploadsPath/' . $attributes['id'] . '/middle/');
66+
},
67+
'hendler' => function($fileTempName, $newFilePath){
68+
Image::thumbnail($fileTempName, 400, 400*2/3)
69+
->save($newFilePath, ['quality' => 80]);
70+
sleep(1);
71+
}
72+
],
73+
[
74+
'path' => function($attributes){
75+
return \Yii::getAlias('@portfoleoPhotosPath/' . $attributes['id'] . '/small/');
76+
},
77+
'hendler' => function($fileTempName, $newFilePath){
78+
Image::thumbnail($fileTempName, 150, 150*2/3)
79+
->save($newFilePath, ['quality' => 80]);
80+
sleep(1);
81+
}
82+
],
83+
]
84+
],
85+
86+
];
87+
}
88+
89+
}

‎tests/unit/UploadFileBehaviorTest.php‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use Yii;
66
use yii\web\UploadedFile;
77
use yii\base\InvalidParamException;
8+
use tests\data\model;
9+
use tests\data\model\Article;
10+
use coderius\yii2UploadFileBehavior\UploadFileBehavior;
811

912
class UploadFileBehaviorTest extends \tests\TestCase
1013
{
@@ -39,23 +42,49 @@ public function testIsFile()
3942
$this->assertTrue($file && $file->tempName);
4043
}
4144

42-
public function testGetNewFileName()
45+
/**
46+
* @dataProvider additionProvider
47+
*/
48+
public function testGetNewFileName($name, $filename, $time)
4349
{
4450
$newFileName = "name";
4551
$file = UploadedFile::getInstanceByName('User[image]');
4652
$baseName = $file->baseName;
4753
$ext = $file->extension;
4854

49-
$result = $newFileName ?
50-
$newFileName . '.' . $file->extension :
51-
$file->baseName . '_' . $this->time . '.' . $file->extension;
55+
$result = $name ?
56+
$name . '.' . $file->extension :
57+
$file->baseName . '_' . $time . '.' . $file->extension;
5258

53-
$this->assertEquals('name.jpg', $result);
59+
$this->assertEquals($filename, $result);
5460
}
5561

56-
public function testSome()
62+
public function additionProvider()
5763
{
58-
$this->assertTrue(true);
64+
$time = time();
65+
66+
return [
67+
["name", "name.jpg", $time],
68+
["name-2", "name-2.jpg", $time],
69+
[false, "test-image_".$time.".jpg", $time],
70+
];
71+
}
72+
73+
public function testUploadImageSaveTrue()
74+
{
75+
$article = new Article();
76+
77+
// $data = [
78+
// 'text' => 'some text',
79+
// 'img_src' => UploadedFile::getInstanceByName('User[image]')
80+
// ];
81+
82+
$article->text = 'some text';
83+
$article->file = UploadedFile::getInstanceByName('User[image]');
84+
$res = $article->save();
85+
86+
// $this->assertEquals($article->img_src, 'test-image.jpg');
87+
$this->assertTrue($res);
5988
}
6089

6190

0 commit comments

Comments
 (0)