Skip to content

Commit 7d795a2

Browse files
mvorisekmvorisek
committed
r
f x
1 parent 8a926a1 commit 7d795a2

26 files changed

+60
-61
lines changed

‎.github/workflows/test-unit.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
DB_USER: atk4_test_user
159159
DB_PASSWORD: atk4_pass
160160
run: |
161-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
161+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
162162
php demos/_demo-data/create-db.php
163163
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
164164
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-mysql.cov; fi
@@ -169,7 +169,7 @@ jobs:
169169
DB_USER: atk4_test_user
170170
DB_PASSWORD: atk4_pass
171171
run: |
172-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
172+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
173173
php demos/_demo-data/create-db.php
174174
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
175175
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-mariadb.cov; fi
@@ -180,7 +180,7 @@ jobs:
180180
DB_USER: atk4_test_user
181181
DB_PASSWORD: atk4_pass
182182
run: |
183-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
183+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
184184
php demos/_demo-data/create-db.php
185185
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
186186
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-postgres.cov; fi
@@ -191,7 +191,7 @@ jobs:
191191
DB_USER: sa
192192
DB_PASSWORD: atk4_pass
193193
run: |
194-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
194+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
195195
php demos/_demo-data/create-db.php
196196
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
197197
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-mssql.cov; fi
@@ -204,7 +204,7 @@ jobs:
204204
DB_PASSWORD: oracle
205205
NLS_LANG: AMERICAN_AMERICA.AL32UTF8
206206
run: |
207-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
207+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
208208
php demos/_demo-data/create-db.php
209209
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v \
210210
|| php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
@@ -364,7 +364,7 @@ jobs:
364364
DB_USER: atk4_test_user
365365
DB_PASSWORD: atk4_pass
366366
run: |
367-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
367+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
368368
php demos/_demo-data/create-db.php
369369
vendor/bin/behat -vv --config behat.yml.dist
370370
@@ -375,7 +375,7 @@ jobs:
375375
DB_USER: atk4_test_user
376376
DB_PASSWORD: atk4_pass
377377
run: |
378-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
378+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
379379
php demos/_demo-data/create-db.php
380380
vendor/bin/behat -vv --config behat.yml.dist
381381
@@ -386,7 +386,7 @@ jobs:
386386
DB_USER: atk4_test_user
387387
DB_PASSWORD: atk4_pass
388388
run: |
389-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
389+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
390390
php demos/_demo-data/create-db.php
391391
vendor/bin/behat -vv --config behat.yml.dist
392392
@@ -397,7 +397,7 @@ jobs:
397397
DB_USER: sa
398398
DB_PASSWORD: atk4_pass
399399
run: |
400-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
400+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
401401
php demos/_demo-data/create-db.php
402402
vendor/bin/behat -vv --config behat.yml.dist
403403
@@ -409,7 +409,7 @@ jobs:
409409
DB_PASSWORD: oracle
410410
NLS_LANG: AMERICAN_AMERICA.AL32UTF8
411411
run: |
412-
sed -E "s~(\\\$db = new.+SqlPersistence)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
412+
sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
413413
php demos/_demo-data/create-db.php
414414
vendor/bin/behat -vv --config behat.yml.dist \
415415
|| vendor/bin/behat -vv --config behat.yml.dist

‎demos/_demo-data/create-db.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
namespace Atk4\Ui\Demos;
66

77
use Atk4\Data\Model;
8-
use Atk4\Data\Persistence\Sql as SqlPersistence;
8+
use Atk4\Data\Persistence;
99
use Atk4\Data\Schema\Migrator;
1010

1111
require_once __DIR__ . '/../init-autoloader.php';
1212

1313
$sqliteFile = __DIR__ . '/db.sqlite';
1414
if (!file_exists($sqliteFile)) {
15-
new SqlPersistence('sqlite:' . $sqliteFile);
15+
new Persistence\Sql('sqlite:' . $sqliteFile);
1616
}
1717
unset($sqliteFile);
1818

19-
/** @var SqlPersistence $db */
19+
/** @var Persistence\Sql $db */
2020
require_once __DIR__ . '/../init-db.php';
2121

2222
class ImportModelWithPrefixedFields extends Model

‎demos/_includes/FlyersForm.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Atk4\Ui\Demos;
66

77
use Atk4\Data\Model;
8-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
8+
use Atk4\Data\Persistence;
99
use Atk4\Ui\Form;
1010

1111
class FlyersForm extends Form
@@ -53,7 +53,7 @@ protected function init(): void
5353
], ['required' => true]);
5454

5555
$ml = $this->addControl('multi', [Form\Control\Multiline::class, 'rowLimit' => 4, 'addOnTab' => true, 'caption' => 'Additional passengers:', 'renderLabel' => false]);
56-
$ml->setModel(new Flyers(new ArrayPersistence($this->flyers)));
56+
$ml->setModel(new Flyers(new Persistence\Array_($this->flyers)));
5757

5858
$cards = $this->addControl('cards', [Form\Control\TreeItemSelector::class, 'treeItems' => $this->cards, 'caption' => 'Flyers program:'], ['type' => 'json']);
5959
$cards->set([]);

‎demos/collection/crud3.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
7+
use Atk4\Data\Persistence;
88

99
/** @var \Atk4\Ui\App $app */
1010
require_once __DIR__ . '/../init-app.php';
@@ -41,7 +41,7 @@ protected function init(): void
4141
8 => ['id' => 8, 'name' => 'ABC2', 'code' => 18, 'country' => 'Russia'],
4242
9 => ['id' => 9, 'name' => 'ABC1', 'code' => 19, 'country' => 'Latvia'],
4343
]];
44-
$p = new ArrayPersistence($data);
44+
$p = new Persistence\Array_($data);
4545
$model = new $modelClass($p);
4646

4747
// add Crud

‎demos/collection/table2.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Static_ as StaticPersistence;
7+
use Atk4\Data\Persistence;
88
use Atk4\Ui\Table;
99

1010
/** @var \Atk4\Ui\App $app */
@@ -16,7 +16,7 @@
1616
['id' => 3, 'action' => 'Tax', 'amount' => -40],
1717
];
1818

19-
$model = new \Atk4\Data\Model(new StaticPersistence($data));
19+
$model = new \Atk4\Data\Model(new Persistence\Static_($data));
2020
$model->getField('amount')->type = 'atk4_money';
2121

2222
\Atk4\Ui\Header::addTo($app, ['Table with various headers', 'subHeader' => 'Demonstrates how you can add subheaders, footnotes and other insertions into your data table', 'icon' => 'table']);

‎demos/collection/tablecolumns.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Static_ as StaticPersistence;
7+
use Atk4\Data\Persistence;
88
use Atk4\Ui\Table;
99

1010
/** @var \Atk4\Ui\App $app */
@@ -112,7 +112,7 @@ protected function init(): void
112112

113113
\Atk4\Ui\Header::addTo($app, ['Table column', 'subHeader' => 'Table column decorator can be set from your model.']);
114114

115-
$model = new $modelColorClass(new StaticPersistence([]));
115+
$model = new $modelColorClass(new Persistence\Static_([]));
116116

117117
foreach (range(1, 10) as $id) {
118118
$key_value = random_int(1, 4);

‎demos/db.default.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Sql as SqlPersistence;
7+
use Atk4\Data\Persistence;
88

99
// to use MySQL database:
1010
// 1. copy this file to "db.php"
1111
// 2. uncomment the line below (and update the configuration if needed)
1212
// 3. remove the Sqlite code from the new file
13-
// $db = new SqlPersistence('mysql:dbname=atk4_test__ui;host=mysql', 'atk4_test', 'atk4_pass');
13+
// $db = new Persistence\Sql('mysql:dbname=atk4_test__ui;host=mysql', 'atk4_test', 'atk4_pass');
1414

1515
$sqliteFile = __DIR__ . '/_demo-data/db.sqlite';
1616
if (!file_exists($sqliteFile)) {
1717
throw new \Exception('Sqlite database does not exist, create it first.');
1818
}
19-
$db = new SqlPersistence('sqlite:' . $sqliteFile);
19+
$db = new Persistence\Sql('sqlite:' . $sqliteFile);
2020
unset($sqliteFile);

‎demos/form-control/multiline.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Atk4\Ui\Demos;
66

77
use Atk4\Data\Model;
8-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
8+
use Atk4\Data\Persistence;
99
use Atk4\Ui\Form;
1010
use Atk4\Ui\Form\Control\Multiline;
1111
use Atk4\Ui\Header;
@@ -73,7 +73,7 @@ protected function init(): void
7373
}
7474
});
7575

76-
$inventory = new $inventoryItemClass(new ArrayPersistence(), ['dateFormat' => $dateFormat, 'timeFormat' => $timeFormat, 'countryPersistence' => $app->db]);
76+
$inventory = new $inventoryItemClass(new Persistence\Array_(), ['dateFormat' => $dateFormat, 'timeFormat' => $timeFormat, 'countryPersistence' => $app->db]);
7777

7878
// Populate some data.
7979
$total = 0;

‎demos/form/form.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
7+
use Atk4\Data\Persistence;
88
use Atk4\Ui\Form;
99

1010
/** @var \Atk4\Ui\App $app */
@@ -171,7 +171,7 @@
171171

172172
\Atk4\Ui\Header::addTo($tab, ['Conditional response']);
173173

174-
$modelRegister = new \Atk4\Data\Model(new ArrayPersistence());
174+
$modelRegister = new \Atk4\Data\Model(new Persistence\Array_());
175175
$modelRegister->addField('name');
176176
$modelRegister->addField('email');
177177
$modelRegister->addField('is_accept_terms', ['type' => 'boolean', 'mandatory' => true]);

‎demos/form/form5.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
7+
use Atk4\Data\Persistence;
88
use Atk4\Ui\Form;
99
use Atk4\Ui\JsToast;
1010

@@ -40,7 +40,7 @@
4040

4141
$form->onSubmit($formSubmit);
4242

43-
$model = new \Atk4\Data\Model(new ArrayPersistence());
43+
$model = new \Atk4\Data\Model(new Persistence\Array_());
4444

4545
// model field uses regular line form control by default
4646
$model->addField('one');

‎demos/form/html-layout.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
7+
use Atk4\Data\Persistence;
88
use Atk4\Ui\Form;
99
use Atk4\Ui\GridLayout;
1010
use Atk4\Ui\Header;
@@ -33,7 +33,7 @@
3333
Header::addTo($right, ['Button on right']);
3434

3535
$form = Form::addTo($right, ['layout' => [Form\Layout::class, 'defaultTemplate' => __DIR__ . '/templates/form-button-right.html']]);
36-
$form->setModel((new Flyers(new ArrayPersistence()))->tryLoadAny());
36+
$form->setModel((new Flyers(new Persistence\Array_()))->tryLoadAny());
3737
$form->getControl('last_name')->hint = 'Please enter your last name.';
3838

3939
$left = View::addTo($gridLayout, [], ['r1c2']);
@@ -48,7 +48,7 @@
4848
],
4949
],
5050
]);
51-
$form->setModel((new Flyers(new ArrayPersistence()))->tryLoadAny());
51+
$form->setModel((new Flyers(new Persistence\Array_()))->tryLoadAny());
5252
$form->getControl('last_name')->hint = 'Please enter your last name.';
5353

5454
////////////////////////////////////////

‎demos/init-app.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Sql as SqlPersistence;
7+
use Atk4\Data\Persistence;
88

99
date_default_timezone_set('UTC');
1010

@@ -61,7 +61,7 @@ public static function get_class(\Closure $createAnonymousClassFx): string
6161
}
6262

6363
try {
64-
/** @var SqlPersistence $db */
64+
/** @var Persistence\Sql $db */
6565
require_once __DIR__ . '/init-db.php';
6666
$app->db = $db;
6767
unset($db);

‎demos/interactive/modal.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
7+
use Atk4\Data\Persistence;
88

99
/** @var \Atk4\Ui\App $app */
1010
require_once __DIR__ . '/../init-app.php';
@@ -182,7 +182,7 @@
182182
$modal->js(true, $prevAction->js()->addClass('disabled'));
183183
$modal->js(true, $nextAction->js(true)->removeClass('disabled'));
184184
} elseif ($page === 2) {
185-
$modelRegister = new \Atk4\Data\Model(new ArrayPersistence());
185+
$modelRegister = new \Atk4\Data\Model(new Persistence\Array_());
186186
$modelRegister->addField('name', ['caption' => 'Please enter your name (John)']);
187187

188188
$form = \Atk4\Ui\Form::addTo($modal, ['segment' => true]);

‎demos/interactive/tabs.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Atk4\Ui\Demos;
66

7-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
7+
use Atk4\Data\Persistence;
88

99
/**
1010
* Demonstrates how to use tabs.
@@ -43,7 +43,7 @@
4343
$tabs->addTab('Dynamic Form', function ($tab) {
4444
\Atk4\Ui\Message::addTo($tab, ['It takes 2 seconds for this tab to load', 'warning']);
4545
sleep(2);
46-
$modelRegister = new \Atk4\Data\Model(new ArrayPersistence());
46+
$modelRegister = new \Atk4\Data\Model(new Persistence\Array_());
4747
$modelRegister->addField('name', ['caption' => 'Please enter your name (John)']);
4848

4949
$form = \Atk4\Ui\Form::addTo($tab, ['segment' => true]);

‎demos/tutorial/intro.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Atk4\Ui\Demos;
66

77
use Atk4\Data\Model;
8-
use Atk4\Data\Persistence\Array_ as ArrayPersistence;
8+
use Atk4\Data\Persistence;
99
use Atk4\Ui\Form;
1010
use Atk4\Ui\Header;
1111
use Atk4\Ui\JsToast;
@@ -141,7 +141,7 @@ protected function init(): void
141141
*/
142142
session_start();
143143

144-
$model = new \Atk4\Ui\Demos\DemoInvoice(new ArrayPersistence($_SESSION['x'] ?? []), ['dateFormat' => $owner->getApp()->ui_persistence->date_format]);
144+
$model = new \Atk4\Ui\Demos\DemoInvoice(new Persistence\Array_($_SESSION['x'] ?? []), ['dateFormat' => $owner->getApp()->ui_persistence->date_format]);
145145
$model->onHook(\Atk4\Data\Model::HOOK_AFTER_SAVE, function (Model $model) {
146146
$_SESSION['x'][$model->getId()] = $model->get();
147147
});
@@ -203,7 +203,7 @@ protected function init(): void
203203
Demo::addTo($page)->setCodeAndCall(function (View $owner) {
204204
session_start();
205205

206-
$model = new \Atk4\Ui\Demos\DemoInvoice(new ArrayPersistence($_SESSION['x'] ?? []), ['dateFormat' => $owner->getApp()->ui_persistence->date_format]);
206+
$model = new \Atk4\Ui\Demos\DemoInvoice(new Persistence\Array_($_SESSION['x'] ?? []), ['dateFormat' => $owner->getApp()->ui_persistence->date_format]);
207207
$model->onHook(\Atk4\Data\Model::HOOK_AFTER_SAVE, function (Model $model) {
208208
$_SESSION['x'][$model->getId()] = $model->get();
209209
});

‎src/App.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Atk4\Core\TraitUtil;
1414
use Atk4\Core\WarnDynamicPropertyTrait;
1515
use Atk4\Data\Persistence;
16-
use Atk4\Data\Persistence\Sql as SqlPersistence;
1716
use Atk4\Ui\Exception\ExitApplicationException;
1817
use Atk4\Ui\Panel\Right;
1918
use Atk4\Ui\Persistence\Ui as UiPersistence;
@@ -117,7 +116,7 @@ class App
117116
/** @var LoggerInterface|null Target for objects with DebugTrait */
118117
public $logger;
119118

120-
/** @var Persistence|SqlPersistence */
119+
/** @var Persistence|Persistence\Sql */
121120
public $db;
122121

123122
/** @var string[] Extra HTTP headers to send on exit. */

‎src/Persistence/PostPersistence.php ‎src/Persistence/Post.php

File renamed without changes.

‎src/Persistence/UiPersistence.php ‎src/Persistence/Ui.php

File renamed without changes.

0 commit comments

Comments
 (0)