Implement #386 #477

DarkSide666 · 2019-11-22T17:39:54Z

Implements #386 (fix #386).

introduce Helper class as a place to put some shared functionality which is used in multiple classes
Helper::readableCaption($s) now is used everywhere to generate model, field or action captions from object class names, field names or any other string. It also is aware of camelCase words now!
added testcases

For example, this ugly string
this\\ _isNASA_MyBigBull shit_123\Foo
will be translated into nice looking, human readable caption
This Is NASA My Big Bull Shit 123 Foo

codecov · 2019-11-22T17:50:13Z

Codecov Report

Merging #477 into develop will decrease coverage by 0.05%.
The diff coverage is 100%.

@@              Coverage Diff              @@
##             develop     #477      +/-   ##
=============================================
- Coverage      86.78%   86.73%   -0.06%     
+ Complexity      1214     1212       -2     
=============================================
  Files             28       28              
  Lines           2672     2661      -11     
=============================================
- Hits            2319     2308      -11     
  Misses           353      353

Impacted Files	Coverage Δ	Complexity Δ
src/Field.php	`78.2% <100%> (-0.14%)`	`95 <0> (-2)`
src/Model.php	`91.29% <100%> (-0.12%)`	`354 <0> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 98a7c46...c449ba8. Read the comment docs.

romaninsh · 2019-11-23T13:28:31Z

src/Util/Helper.php

+        $s = ucwords(preg_replace('/[^a-z0-9]+/i', ' ', $s));
+
+        // and then run regex to split camelcased words too
+        $s = array_map('trim', preg_split('/^[^A-Z\d]+\K|[A-Z\d][^A-Z\d]+\K/', $s, -1, PREG_SPLIT_NO_EMPTY));


i think this should go to ATK Core, as a trait.

implemented

romaninsh

please move this into atk core.

romaninsh

looks great, just re-run the test after a bit.

* wip * wip * fixes * Feature/test1 (#483) * fixes * testtisg * wip * test * backmerge master * normalize everything * added locale test (#485) * added locale test * Apply fixes from StyleCI * wip * wip * Apply fixes from StyleCI * Update CHANGELOG.md * Implement #386 (#477) * Implement #386 * Apply fixes from StyleCI * Update Field.php * Update Model.php * Update Helper.php * Apply fixes from StyleCI * move functionality to atk4/core * Apply fixes from StyleCI * fix traits * Apply fixes from StyleCI * fix typo * Feature/pgsql test (#486) * fix one test * Setting current dependencies * wip * wip * Add matrix testing (#492) * Test using matrix * wip * wip * wip * clean up bundler * clean up bundler (#493) * wip * Setting current dependencies

* wip * wip * fixes * Feature/test1 (#483) * fixes * testtisg * wip * test * backmerge master * normalize everything * added locale test (#485) * added locale test * Apply fixes from StyleCI * wip * wip * Apply fixes from StyleCI * Update CHANGELOG.md * Implement #386 (#477) * Implement #386 * Apply fixes from StyleCI * Update Field.php * Update Model.php * Update Helper.php * Apply fixes from StyleCI * move functionality to atk4/core * Apply fixes from StyleCI * fix traits * Apply fixes from StyleCI * fix typo * Feature/pgsql test (#486) * fix one test * Setting current dependencies * wip * wip * Add matrix testing (#492) * Test using matrix * wip * wip * wip * clean up bundler * clean up bundler (#493) * wip * Fix/delete callback (#488) * fix one test * Setting current dependencies * fix/delete callback * Update composer.json * Fix/persistence sql condition (#487) * fix one test * Setting current dependencies * fix wrong assignment of value as condition * Update composer.json * Update SQL.php * Feature remove specified action (#489) * fix one test * Setting current dependencies * add method to remove specified action(s) from model * Update Model.php * spaces * Feature/add confirmation callback argument (#491) * fix one test * Setting current dependencies * pass the action object as argument to confirmation callback * badge * Feature/set custom edit exec button (#490) * fix one test * Setting current dependencies * use custom exec button on edit action * Update Model.php * remove class, use seed Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * model default add field property (#454) * use the object default add field property * no need for double brackets. * force tests Co-authored-by: Romans Malinovskis <me@nearly.guru> Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * Fix empty array condition (#498) * more tests * Apply fixes from StyleCI * better implementation for addFields() and test cases (#499) * better implementation for addFields() and test cases * Apply fixes from StyleCI * use shorthand method * simplify code * implement `exprNow()` method. Rely on dsql PR. * Apply fixes from StyleCI * pass * add docs Co-authored-by: Romans Malinovskis <me@nearly.guru> * Fix/ Small Action related fix (#502) * Fix/ Small Action related fix - Set Edit action exec button labe lto 'Save' by default - Set Edit action exec button colot to blue by default - Set default description for Add action in model - Add method to retreive model from Action * Apply fixes from StyleCI * fix comment Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * update multiple delete example (#503) * now supports multiple filter options in getFields() * Apply fixes from StyleCI * Accept any DateTimeInterface impl. for datetime (#505) * Accept any DateTimeInterface impl. for datetime * Fix DateTime::getTimezone method name * Fix setTimezone for any instance of DateTimeInterface * Add microseconds persistence support for datetime/time types + fix normalization/cloning issue (#504) * Fix datetime normalization cloning * Add microseconds persistence support for datetime/time types Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * include comment about hooks and example how to execute them (#510) * update composer * Update release-drafter.yml * Update bundler.yml * Setting release dependencies Co-authored-by: Romans Malinovskis <me@nearly.guru> Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> Co-authored-by: Georgi Hristov <georgehristov@users.noreply.github.com> Co-authored-by: Mimo <ddobchev@gmail.com> Co-authored-by: Alain Belair <belair.alain@gmail.com> Co-authored-by: Michael Voříšek <mvorisek@mvorisek.cz> Co-authored-by: GitHub Web Flow <noreply@github.com>

* wip * wip * fixes * Feature/test1 (#483) * fixes * testtisg * wip * test * backmerge master * normalize everything * added locale test (#485) * added locale test * Apply fixes from StyleCI * wip * wip * Apply fixes from StyleCI * Update CHANGELOG.md * Implement #386 (#477) * Implement #386 * Apply fixes from StyleCI * Update Field.php * Update Model.php * Update Helper.php * Apply fixes from StyleCI * move functionality to atk4/core * Apply fixes from StyleCI * fix traits * Apply fixes from StyleCI * fix typo * Feature/pgsql test (#486) * fix one test * Setting current dependencies * wip * wip * Add matrix testing (#492) * Test using matrix * wip * wip * wip * clean up bundler * clean up bundler (#493) * wip * Fix/delete callback (#488) * fix one test * Setting current dependencies * fix/delete callback * Update composer.json * Fix/persistence sql condition (#487) * fix one test * Setting current dependencies * fix wrong assignment of value as condition * Update composer.json * Update SQL.php * Feature remove specified action (#489) * fix one test * Setting current dependencies * add method to remove specified action(s) from model * Update Model.php * spaces * Feature/add confirmation callback argument (#491) * fix one test * Setting current dependencies * pass the action object as argument to confirmation callback * badge * Feature/set custom edit exec button (#490) * fix one test * Setting current dependencies * use custom exec button on edit action * Update Model.php * remove class, use seed Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * model default add field property (#454) * use the object default add field property * no need for double brackets. * force tests Co-authored-by: Romans Malinovskis <me@nearly.guru> Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * Fix empty array condition (#498) * more tests * Apply fixes from StyleCI * better implementation for addFields() and test cases (#499) * better implementation for addFields() and test cases * Apply fixes from StyleCI * use shorthand method * simplify code * implement `exprNow()` method. Rely on dsql PR. * Apply fixes from StyleCI * pass * add docs Co-authored-by: Romans Malinovskis <me@nearly.guru> * Fix/ Small Action related fix (#502) * Fix/ Small Action related fix - Set Edit action exec button labe lto 'Save' by default - Set Edit action exec button colot to blue by default - Set default description for Add action in model - Add method to retreive model from Action * Apply fixes from StyleCI * fix comment Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * update multiple delete example (#503) * now supports multiple filter options in getFields() * Apply fixes from StyleCI * Accept any DateTimeInterface impl. for datetime (#505) * Accept any DateTimeInterface impl. for datetime * Fix DateTime::getTimezone method name * Fix setTimezone for any instance of DateTimeInterface * Add microseconds persistence support for datetime/time types + fix normalization/cloning issue (#504) * Fix datetime normalization cloning * Add microseconds persistence support for datetime/time types Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> * include comment about hooks and example how to execute them (#510) * update composer * Update release-drafter.yml * Update bundler.yml * Fix hasOne relation seed processing. It should replace not merge. (#512) * New method $model->getTitles() (#513) * Implement `getTitles()` method * Apply fixes from StyleCI * Update unit-tests.yml * migration to migrator * rename addHook to onHook (#514) * fix #944 (#516) * allow dots in table names, fix #515, fix #517 * Apply fixes from StyleCI * Do not fail-fast PHP test matrix (#522) * Simplify code (#519) * Update release-drafter.yml * Update release-drafter.yml * Fix hook trait usage (#525) * Hook args must be an array * Fix hook onHook() usage * Implement addWith() (#527) * Implement addWith() * Apply fixes from StyleCI * implement `addWith` * add docs * add note * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Update unit-tests.yml * Action should also support `fields===true` value (#531) * Fix LIKE conditions for Array and SQL persistences (#532) * Fix LIKE conditions - fix fix (#535) * fix #533 (#537) * Fix value trim (#538) * introduce sql null condition test (#540) * introduce test on condition with null value * include mesage in SQL exception details * Fix typo * Convert scalar class names to ::class (#544) * Fix CS - do not import classes without namespace * Use null coalescing operator instead of isset (#545) * Use null coalescing operator instead of isset * Fix tests * Fix refactorability for "owner" (#543) * Fix refactorability for "owner" * Typehint for elements * Narrow phpdoc for SQL subtypes * Fix typos * Setting release dependencies Co-authored-by: Romans Malinovskis <romans@agiletoolkit.org> Co-authored-by: Romans Malinovskis <me@nearly.guru> Co-authored-by: Imants Horsts <DarkSide666@users.noreply.github.com> Co-authored-by: Georgi Hristov <georgehristov@users.noreply.github.com> Co-authored-by: Mimo <ddobchev@gmail.com> Co-authored-by: Alain Belair <belair.alain@gmail.com> Co-authored-by: DarkSide <imants.horsts@inbox.lv> Co-authored-by: Michael Voříšek <mvorisek@mvorisek.cz> Co-authored-by: GitHub Action <noreply@github.com>

DarkSide666 added 2 commits November 22, 2019 19:36

Implement #386

a3fcae8

Apply fixes from StyleCI

e8466da

DarkSide666 requested a review from romaninsh November 22, 2019 17:40

DarkSide666 self-assigned this Nov 22, 2019

DarkSide666 added the in review label Nov 22, 2019

DarkSide666 mentioned this pull request Nov 22, 2019

Convert camel case field names to captions in model #386

Closed

Update Field.php

c3ca4f5

DarkSide666 added 2 commits November 22, 2019 19:50

Update Model.php

e12941d

Update Helper.php

70e98ce

romaninsh reviewed Nov 23, 2019

View reviewed changes

romaninsh requested changes Nov 23, 2019

View reviewed changes

romaninsh and others added 4 commits November 25, 2019 03:12

Merge branch 'develop' into feature/implement-386

58d02d2

Apply fixes from StyleCI

f6ec70a

move functionality to atk4/core

7d4f225

Apply fixes from StyleCI

5dacd16

DarkSide666 requested a review from romaninsh November 26, 2019 15:29

romaninsh approved these changes Nov 26, 2019

View reviewed changes

DarkSide666 added 2 commits November 26, 2019 19:50

fix traits

3d71714

Apply fixes from StyleCI

c449ba8

DarkSide666 merged commit 2437143 into develop Nov 26, 2019

DarkSide666 deleted the feature/implement-386 branch November 26, 2019 17:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement #386 #477

Implement #386 #477

DarkSide666 commented Nov 22, 2019 •

edited

Loading

codecov bot commented Nov 22, 2019 •

edited

Loading

romaninsh Nov 23, 2019 •

edited

Loading

DarkSide666 Nov 26, 2019

romaninsh left a comment

romaninsh left a comment

Implement #386 #477

Implement #386 #477

Conversation

DarkSide666 commented Nov 22, 2019 • edited Loading

codecov bot commented Nov 22, 2019 • edited Loading

Codecov Report

romaninsh Nov 23, 2019 • edited Loading

Choose a reason for hiding this comment

DarkSide666 Nov 26, 2019

Choose a reason for hiding this comment

romaninsh left a comment

Choose a reason for hiding this comment

romaninsh left a comment

Choose a reason for hiding this comment

DarkSide666 commented Nov 22, 2019 •

edited

Loading

codecov bot commented Nov 22, 2019 •

edited

Loading

romaninsh Nov 23, 2019 •

edited

Loading