From db781fab15984a86c2144f12c6506f9b3af3943f Mon Sep 17 00:00:00 2001 From: Anton Shevchuk Date: Wed, 8 Nov 2017 15:30:38 +0200 Subject: [PATCH 1/5] Updated codestyle --- public/js/bluz.media.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/bluz.media.js b/public/js/bluz.media.js index 273a4aa..27bbe54 100644 --- a/public/js/bluz.media.js +++ b/public/js/bluz.media.js @@ -8,7 +8,7 @@ * - push.data.bluz */ /* global define,require*/ -define(['jquery', 'bluz', 'bluz.notify', 'dropzone'], function ($, bluz, notify, Dropzone) { +define(['jquery', 'bluz', 'bluz.ajax', 'bluz.notify', 'dropzone'], function ($, bluz, ajax, notify, Dropzone) { 'use strict'; // Media object @@ -36,7 +36,7 @@ define(['jquery', 'bluz', 'bluz.notify', 'dropzone'], function ($, bluz, notify, // hookup for delete click media.$previews.on('success.bluz.ajax', 'a[data-ajax-method=delete]', function () { - $(this).parents('div.image-preview').remove(); + $(this).parents('div.card').remove(); }); }; @@ -59,11 +59,11 @@ define(['jquery', 'bluz', 'bluz.notify', 'dropzone'], function ($, bluz, notify, }) .on('processing', () => { // use element similar to bluz.ajax - bluz.showLoading(); + ajax.showLoading(); media.$progress.removeAttr('hidden'); }) .on('complete', () => { - bluz.hideLoading(); + ajax.hideLoading(); media.$progress.attr('hidden', '1'); media.$upload.stop(true, true); }) From 099889b0269b8a709effa81d97f2e514adf0b7dc Mon Sep 17 00:00:00 2001 From: Anton Shevchuk Date: Mon, 13 Nov 2017 10:07:33 +0200 Subject: [PATCH 2/5] Migrate to PHP 7.1 --- .travis.yml | 1 - .../modules/media/controllers/crud.php | 2 +- application/modules/media/views/crud.phtml | 4 +++- .../modules/media/controllers/CrudTest.php | 22 ++++++++++++------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2748c1..580ed9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: php php: - - 7.0 - 7.1 - 7.2 - master diff --git a/application/modules/media/controllers/crud.php b/application/modules/media/controllers/crud.php index da45044..da415ed 100644 --- a/application/modules/media/controllers/crud.php +++ b/application/modules/media/controllers/crud.php @@ -57,7 +57,7 @@ $result = $crudController->run(); // back to grid after create or update media file - if (Request::isPost() || Request::isPut()) { + if ((Request::isPost() || Request::isPut()) && !Request::isXmlHttpRequest()) { Response::reload(); } diff --git a/application/modules/media/views/crud.phtml b/application/modules/media/views/crud.phtml index 90e7fef..6cb9268 100644 --- a/application/modules/media/views/crud.phtml +++ b/application/modules/media/views/crud.phtml @@ -4,7 +4,9 @@ */ ?> -
+>
diff --git a/tests/unit/modules/media/controllers/CrudTest.php b/tests/unit/modules/media/controllers/CrudTest.php index f6335bc..8c51c6a 100644 --- a/tests/unit/modules/media/controllers/CrudTest.php +++ b/tests/unit/modules/media/controllers/CrudTest.php @@ -20,6 +20,7 @@ use Bluz\Proxy\Config; use Bluz\Proxy\Db; use Bluz\Proxy\Request; +use Bluz\Proxy\Response; use Zend\Diactoros\UploadedFile; /** @@ -49,9 +50,15 @@ public function setUp() */ public static function tearDownAfterClass() { - Db::delete('media')->where('userId = ?', 1)->execute(); - $path = Config::getModuleData('media', 'upload_path').'/1'; - Tools\Cleaner::delete($path); + // need to connect to DB + self::getApp(); + { + Db::delete('media')->where('userId = ?', 1)->execute(); + $path = Config::getModuleData('media', 'upload_path').'/1'; + Tools\Cleaner::delete($path); + } + self::resetApp(); + self::resetGlobals(); } /** @@ -78,6 +85,7 @@ public function testUploadFile() Request::setInstance($request); self::getApp()->process(); + codecept_debug(Response::getHeader('Location')); self::assertReload(); } @@ -97,14 +105,12 @@ public function testCreateForm() */ public function testEditForm() { - /* - $this->dispatchRouter('/media/crud/', ['id' => 1]); - self::assertOk(); + $this->dispatch('/media/crud'); + self::assertOk(); self::assertQueryCount('form[method="PUT"]', 1); +// self::assertQueryCount('input[name="id"][value="1"]', 1); - self::assertQueryCount('input[name="id"][value="1"]', 1); - */ // Remove the following lines when you implement this test. // Need to create element with ID self::markTestIncomplete( From cb1301b0eb6f5e86c128553a1bf06e81096d0758 Mon Sep 17 00:00:00 2001 From: Anton Shevchuk Date: Tue, 14 Nov 2017 18:51:52 +0200 Subject: [PATCH 3/5] Migrate to PHP 7.1 --- application/models/Media/Grid.php | 8 ++------ application/models/Media/Manager.php | 4 ++-- application/models/Media/Row.php | 10 +++++----- application/models/Media/Table.php | 6 +++--- application/modules/media/controllers/upload.php | 2 +- tests/unit/modules/media/controllers/CrudTest.php | 7 ------- 6 files changed, 13 insertions(+), 24 deletions(-) diff --git a/application/models/Media/Grid.php b/application/models/Media/Grid.php index 1fd293e..e6b6ec5 100644 --- a/application/models/Media/Grid.php +++ b/application/models/Media/Grid.php @@ -21,11 +21,9 @@ class Grid extends \Bluz\Grid\Grid protected $uid = 'options'; /** - * init - * - * @return self + * {@inheritdoc} */ - public function init() + public function init() : void { // Array $adapter = new SqlSource(); @@ -41,7 +39,5 @@ public function init() $this->setDefaultLimit(25); $this->setAllowOrders(['id', 'login', 'title', 'type', 'created', 'deleted']); $this->setAllowFilters(['userId', 'title', 'file']); - - return $this; } } diff --git a/application/models/Media/Manager.php b/application/models/Media/Manager.php index cdff2c1..0ae7280 100644 --- a/application/models/Media/Manager.php +++ b/application/models/Media/Manager.php @@ -9,8 +9,8 @@ namespace Application\Media; use Application\Users; -use Bluz\Application\Exception\BadRequestException; use Bluz\Config\ConfigException; +use Bluz\Http\Exception\BadRequestException; use Bluz\Proxy\Auth; use Bluz\Proxy\Config; use Image\Thumbnail; @@ -62,7 +62,7 @@ public function __construct($media, $file) { $this->media = $media; $this->media->module = $this->media->module ?: 'users'; - $this->media->userId = $this->media->userId ?: Auth::getIdentity()->id ?: Users\Table::SYSTEM_USER; + $this->media->userId = $this->media->userId ?: Auth::getIdentity()->getId() ?: Users\Table::SYSTEM_USER; $this->file = $file; $this->name = $media->title ?? pathinfo($file->getClientFilename(), PATHINFO_FILENAME); diff --git a/application/models/Media/Row.php b/application/models/Media/Row.php index bf6bb1d..8d07125 100644 --- a/application/models/Media/Row.php +++ b/application/models/Media/Row.php @@ -37,7 +37,7 @@ class Row extends \Bluz\Db\Row /** * {@inheritdoc} */ - protected function beforeSave() + protected function beforeSave() : void { $this->addValidator('title') ->required() @@ -49,7 +49,7 @@ protected function beforeSave() * * @return void */ - protected function beforeInsert() + protected function beforeInsert() : void { $this->created = gmdate('Y-m-d H:i:s'); @@ -59,7 +59,7 @@ protected function beforeInsert() } // set user ID if ($user = Auth::getIdentity()) { - $this->userId = $user->id; + $this->userId = $user->getId(); } else { $this->userId = Users\Table::SYSTEM_USER; } @@ -70,7 +70,7 @@ protected function beforeInsert() * * @return void */ - protected function beforeUpdate() + protected function beforeUpdate() : void { $this->updated = gmdate('Y-m-d H:i:s'); } @@ -80,7 +80,7 @@ protected function beforeUpdate() * * @return void */ - protected function afterDelete() + protected function afterDelete() : void { $this->deleteFiles(); } diff --git a/application/models/Media/Table.php b/application/models/Media/Table.php index f7ce7e8..7d5e337 100644 --- a/application/models/Media/Table.php +++ b/application/models/Media/Table.php @@ -32,7 +32,7 @@ class Table extends \Bluz\Db\Table * Primary key(s) * @var array */ - protected $primary = array('id'); + protected $primary = ['id']; /** * Get images of current user @@ -42,12 +42,12 @@ class Table extends \Bluz\Db\Table */ public function getImages() { - /** @var Row $user */ + /* @var \Application\Users\Row $user */ if (!$user = Auth::getIdentity()) { throw new Exception('User not found'); } - return $this->getImagesByUserId($user->id); + return $this->getImagesByUserId($user->getId()); } /** diff --git a/application/modules/media/controllers/upload.php b/application/modules/media/controllers/upload.php index 3925b80..02d9280 100644 --- a/application/modules/media/controllers/upload.php +++ b/application/modules/media/controllers/upload.php @@ -11,7 +11,7 @@ */ namespace Application; -use Bluz\Application\Exception\BadRequestException; +use Bluz\Http\Exception\BadRequestException; use Bluz\Config\ConfigException; use Bluz\Controller\Controller; use Bluz\Proxy\Request; diff --git a/tests/unit/modules/media/controllers/CrudTest.php b/tests/unit/modules/media/controllers/CrudTest.php index 8c51c6a..964ea02 100644 --- a/tests/unit/modules/media/controllers/CrudTest.php +++ b/tests/unit/modules/media/controllers/CrudTest.php @@ -85,7 +85,6 @@ public function testUploadFile() Request::setInstance($request); self::getApp()->process(); - codecept_debug(Response::getHeader('Location')); self::assertReload(); } @@ -105,12 +104,6 @@ public function testCreateForm() */ public function testEditForm() { - $this->dispatch('/media/crud'); - - self::assertOk(); - self::assertQueryCount('form[method="PUT"]', 1); -// self::assertQueryCount('input[name="id"][value="1"]', 1); - // Remove the following lines when you implement this test. // Need to create element with ID self::markTestIncomplete( From 8120a8c6488a554a0e754c68818f91b4ed8f9a72 Mon Sep 17 00:00:00 2001 From: Anton Shevchuk Date: Tue, 26 Dec 2017 11:58:22 +0200 Subject: [PATCH 4/5] Crated `vendor` directory in `public` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 13e4221..222a331 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ }, "extra": { "copy-files": { - "enyo/dropzone/dist/min/dropzone-amd-module.min.js": "public/js/vendor/dropzone-amd-module.min.js" + "enyo/dropzone/dist/": "public/vendor/dropzone-amd-module/" } } } From 00848f508f2721234cad73c63976195adc006c04 Mon Sep 17 00:00:00 2001 From: Anton Shevchuk Date: Wed, 3 Oct 2018 18:49:06 +0300 Subject: [PATCH 5/5] Updated dependencies --- .../config.php => configs/default/module.media.php} | 0 application/models/Media/Manager.php | 2 +- application/modules/media/views/grid.phtml | 2 +- public/css/media.css | 11 +++++++++++ tests/unit/modules/media/controllers/CrudTest.php | 4 ++-- 5 files changed, 15 insertions(+), 4 deletions(-) rename application/{modules/media/config.php => configs/default/module.media.php} (100%) diff --git a/application/modules/media/config.php b/application/configs/default/module.media.php similarity index 100% rename from application/modules/media/config.php rename to application/configs/default/module.media.php diff --git a/application/models/Media/Manager.php b/application/models/Media/Manager.php index 0ae7280..935e65c 100644 --- a/application/models/Media/Manager.php +++ b/application/models/Media/Manager.php @@ -81,7 +81,7 @@ public function __construct($media, $file) */ public function moveToDir($directory) { - $uploadPath = Config::getModuleData('media', 'upload_path'); + $uploadPath = Config::get('module.media', 'upload_path'); if (empty($uploadPath)) { throw new ConfigException('Upload path is not configured'); diff --git a/application/modules/media/views/grid.phtml b/application/modules/media/views/grid.phtml index 55365c1..092543a 100644 --- a/application/modules/media/views/grid.phtml +++ b/application/modules/media/views/grid.phtml @@ -42,7 +42,7 @@ if (!$grid) {
getData() as $row) : ?> -
+
<?= esc($row['title']) ?> diff --git a/public/css/media.css b/public/css/media.css index a46649f..fa44040 100644 --- a/public/css/media.css +++ b/public/css/media.css @@ -23,4 +23,15 @@ max-height: 480px; overflow-y: scroll; border: 2px dashed rgba(0, 0, 0, 0.1); +} + +.card-deck .card { + min-width: 240px; + max-width: 240px +} + +.card-deck .card-img-top { + /*display: block; + min-width: 196px; + max-width: 196px*/ } \ No newline at end of file diff --git a/tests/unit/modules/media/controllers/CrudTest.php b/tests/unit/modules/media/controllers/CrudTest.php index 964ea02..fab27f3 100644 --- a/tests/unit/modules/media/controllers/CrudTest.php +++ b/tests/unit/modules/media/controllers/CrudTest.php @@ -54,7 +54,7 @@ public static function tearDownAfterClass() self::getApp(); { Db::delete('media')->where('userId = ?', 1)->execute(); - $path = Config::getModuleData('media', 'upload_path').'/1'; + $path = Config::get('module.media', 'upload_path').'/1'; Tools\Cleaner::delete($path); } self::resetApp(); @@ -67,7 +67,7 @@ public static function tearDownAfterClass() public function testUploadFile() { // get path from config - $path = Config::getData('temp', 'path'); + $path = Config::get('temp', 'path'); if (empty($path)) { throw new Exception('Temporary path is not configured'); }