Fix tests when atk4/ui is installed and remove atk4/data dev dependen…

…cy (#328)
atk4 · Oct 4, 2021 · 10a3fb5 · 10a3fb5
1 parent 6cd61da
commit 10a3fb5
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 154 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -26,8 +26,8 @@
  - open docs/html/index.html in your browser and review documentation changes you have made
  - commit your code. Name your commits consistently. See [https://github.com/atk4/core/commits/develop](https://github.com/atk4/core/commits/develop)
  - use multiple comments if necessary. I recommend you to use "Github Desktop", where you can even perform partial file commits.
- - once commits are done run `git feature publish fix-psr-compatibility`. 
- 
+ - once commits are done run `git feature publish fix-psr-compatibility`.
+
 ## Create Pull Request
 
  - Go to [http://github.com/atk4/core](http://github.com/atk4/core) and create Pull Request
@@ -41,7 +41,7 @@
 
  - Fork atk4/core repository.
  - Follow same instructions as above, but use your own repository name
- - If you contribute a lot, it would make sense to [set up codeclimate.com for your repo](https://codeclimate.com/github/signup). 
+ - If you contribute a lot, it would make sense to [set up codeclimate.com for your repo](https://codeclimate.com/github/signup).
  - You can also enable Travis-CI for your repository easily.
 
 ## Verifying your code

diff --git a/composer.json b/composer.json
@@ -31,15 +31,14 @@
         }
     ],
     "require": {
-        "php": ">=7.4.0",
+        "php": ">=7.4 <8.2",
         "ext-json": "*",
         "psr/log": "~1.0",
         "symfony/polyfill-php80": "^1.17",
         "symfony/polyfill-php81": "^1.22",
         "symfony/yaml": "^3.4 || ^4.4 || ^5.1"
     },
     "require-dev": {
-        "atk4/data": "dev-develop",
         "ergebnis/composer-normalize": "^2.13",
         "friendsofphp/php-cs-fixer": "^3.0",
         "johnkary/phpunit-speedtrap": "^3.3",
@@ -48,7 +47,6 @@
         "symfony/contracts": ">=1.1"
     },
     "require-dev-release": {
-        "atk4/data": "~3.1.0",
         "ergebnis/composer-normalize": "^2.13",
         "friendsofphp/php-cs-fixer": "^3.0",
         "johnkary/phpunit-speedtrap": "^3.3",

diff --git a/src/AppScopeTrait.php b/src/AppScopeTrait.php
@@ -60,12 +60,16 @@ trait AppScopeTrait
 
     protected function assertInstanceOfApp(object $app): void
     {
-        // called from phpunit, allow to use/test this trait without \Atk4\Ui\App class
-        if (class_exists(\PHPUnit\Framework\TestCase::class, false) && !class_exists(\Atk4\Ui\App::class)) {
-            return;
-        }
-
         if (!$app instanceof \Atk4\Ui\App) {
+            // called from phpunit, allow to use/test this trait without \Atk4\Ui\App class
+            if (class_exists(\PHPUnit\Framework\TestCase::class, false)) {
+                foreach (debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
+                    if (str_starts_with($frame['class'] ?? '', 'Atk4\Core\Tests\\')) {
+                        return;
+                    }
+                }
+            }
+
             throw new Exception('App must be instance of \Atk4\Ui\App');
         }
     }
@@ -76,7 +80,7 @@ protected function assertInstanceOfApp(object $app): void
     private function assertNoDirectAppAssignment(): void
     {
         if ($this->app !== null) {
-            throw new Exception('App can not be assigned directly');
+            throw new Exception('App cannot be assigned directly');
         }
     }
 
@@ -109,7 +113,7 @@ public function setApp(object $app)
         $this->assertInstanceOfApp($app);
         if ($this->issetApp() && $this->getApp() !== $app) {
             if ($this->getApp()->catch_exceptions || $this->getApp()->always_run) { // allow to replace App created by AbstractView::initDefaultApp() - TODO fix
-                throw new Exception('App can not be replaced');
+                throw new Exception('App cannot be replaced');
             }
         }
 

diff --git a/src/ConfigTrait.php b/src/ConfigTrait.php
@@ -45,7 +45,7 @@ public function readConfig($files = ['config.php'], string $format = 'php')
         $configs = [];
         foreach ($files as $file) {
             if (!is_readable($file)) {
-                throw (new Exception('Can not read config file'))
+                throw (new Exception('Cannot read config file'))
                     ->addMoreInfo('file', $file)
                     ->addMoreInfo('format', $format);
             }

diff --git a/src/DebugTrait.php b/src/DebugTrait.php
@@ -103,9 +103,9 @@ public function userMessage(string $message, array $context = [])
     public function debugTraceChange(string $trace = 'default'): void
     {
         $bt = [];
-        foreach (debug_backtrace() as $line) {
-            if (isset($line['file'])) {
-                $bt[] = $line['file'] . ':' . $line['line'];
+        foreach (debug_backtrace() as $frame) {
+            if (isset($frame['file'])) {
+                $bt[] = $frame['file'] . ':' . $frame['line'];
             }
         }
 

diff --git a/src/DiContainerTrait.php b/src/DiContainerTrait.php
@@ -76,7 +76,7 @@ protected function setMissingProperty(string $propertyName, $value): void
      * Return the argument and assert it is instance of current class.
      *
      * The best, typehinting-friendly, way to annotate object type if it not defined
-     * at method header or strong typing in method header can not be used.
+     * at method header or strong typing in method header cannot be used.
      *
      * @return static
      */

diff --git a/src/Factory.php b/src/Factory.php
@@ -89,7 +89,7 @@ protected function _mergeSeeds(...$seeds)
 
         unset($arguments[0]); // the first argument specifies a class name
         if (count($arguments) > 0) {
-            throw (new Exception('Constructor arguments can not be injected into existing object'))
+            throw (new Exception('Constructor arguments cannot be injected into existing object'))
                 ->addMoreInfo('object', $obj)
                 ->addMoreInfo('arguments', $arguments);
         }

diff --git a/src/HookTrait.php b/src/HookTrait.php
@@ -50,7 +50,7 @@ private function _rebindHooksIfCloned(): void
                         // but instead we should throw once the closure this object is cloned
                         // example of legit use: https://github.com/atk4/audit/blob/eb9810e085a40caedb435044d7318f4d8dd93e11/src/Controller.php#L85
                         if (get_class($fxThis) === get_class($this->_hookOrigThis) || preg_match('~^Atk4\\\\(?:Core|Dsql|Data)~', get_class($fxThis))) {
-                            throw (new Exception('Object can not be cloned with hook bound to a different object than this'))
+                            throw (new Exception('Object cannot be cloned with hook bound to a different object than this'))
                                 ->addMoreInfo('closure_file', $fxRefl->getFileName())
                                 ->addMoreInfo('closure_start_line', $fxRefl->getStartLine());
                         }
@@ -134,7 +134,7 @@ private function makeHookDynamicFx(\Closure $getFxThisFx, \Closure $fx, array $a
         return function ($ignore, &...$args) use ($getFxThisFx, $fx, $isShort) {
             $fxThis = $getFxThisFx($this);
             if ($fxThis === null) {
-                throw new Exception('New $this can not be null');
+                throw new Exception('New $this cannot be null');
             }
 
             return \Closure::bind($fx, $fxThis)(...($isShort ? [] : [$this]), ...$args);

diff --git a/src/TrackableTrait.php b/src/TrackableTrait.php
@@ -40,7 +40,7 @@ trait TrackableTrait
     private function assertNoDirectOwnerAssignment(): void
     {
         if ($this->owner !== null) {
-            throw new Exception('Owner can not be assigned directly');
+            throw new Exception('Owner cannot be assigned directly');
         }
     }
 

diff --git a/src/Translator/Adapter/Generic.php b/src/Translator/Adapter/Generic.php
@@ -6,7 +6,6 @@
 
 use Atk4\Core\ConfigTrait;
 use Atk4\Core\Translator\ITranslatorAdapter;
-use Atk4\Data\Locale;
 
 class Generic implements ITranslatorAdapter
 {
@@ -83,44 +82,19 @@ protected function processMessagePlural($definition, array $parameters = [], int
      */
     protected function getDefinition(string $message, string $domain, ?string $locale)
     {
-        $this->loadDefinitionAtk($locale); // need to be called before manual add
-
         return $this->definitions[$locale][$domain][$message] ?? null;
     }
 
-    protected function loadDefinitionAtk(string $locale): void
-    {
-        if (isset($this->definitions[$locale]['atk'])) {
-            return;
-        }
-
-        $this->definitions[$locale]['atk'] = [];
-
-        if (class_exists(\Atk4\Data\Locale::class)) {
-            $path = Locale::getPath();
-            $this->addDefinitionFromFile($path . '/' . $locale . '/atk.php', $locale, 'atk', 'php');
-        }
-    }
-
-    /**
-     * Load definitions from file.
-     */
-    public function addDefinitionFromFile(string $file, string $locale, string $domain, string $format): void
+    public function addDefinitionFromArray(array $data, string $locale, string $domain): void
     {
-        $this->loadDefinitionAtk($locale); // need to be called before manual add
-
-        $this->readConfig($file, $format);
-
         $this->definitions = array_replace_recursive(
             $this->definitions,
             [
                 $locale => [
-                    $domain => $this->config,
+                    $domain => $data,
                 ],
             ]
         );
-
-        $this->config = [];
     }
 
     /**
@@ -132,8 +106,6 @@ public function addDefinitionFromFile(string $file, string $locale, string $doma
      */
     public function setDefinitionSingle(string $key, $definition, string $locale = 'en', string $domain = 'atk')
     {
-        $this->loadDefinitionAtk($locale); // need to be called before manual add
-
         if (is_string($definition)) {
             $definition = [$definition];
         }

diff --git a/tests/CollectionTraitTest.php b/tests/CollectionTraitTest.php
@@ -88,7 +88,7 @@ public function testException3(): void
     }
 
     /**
-     * Can not remove non existant object.
+     * Cannot remove non existant object.
      */
     public function testException4(): void
     {
@@ -98,7 +98,7 @@ public function testException4(): void
     }
 
     /**
-     * Can not get non existant object.
+     * Cannot get non existant object.
      */
     public function testException5(): void
     {
@@ -108,7 +108,7 @@ public function testException5(): void
     }
 
     /**
-     * Can not get non existant object.
+     * Cannot get non existant object.
      */
     public function testException6(): void
     {

diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -480,7 +480,7 @@ public function testFactoryParameters(): void
     }
 
     /**
-     * Object factory can not add not defined properties.
+     * Object factory cannot add not defined properties.
      * Receive as class name.
      */
     public function testFactoryParametersException1(): void
@@ -492,7 +492,7 @@ public function testFactoryParametersException1(): void
     }
 
     /**
-     * Object factory can not add not defined properties.
+     * Object factory cannot add not defined properties.
      * Receive as object.
      */
     public function testFactoryParametersException2(): void

diff --git a/tests/HookTraitTest.php b/tests/HookTraitTest.php
@@ -322,7 +322,7 @@ public function makeCallback(): \Closure
         $m->onHook('inc', (clone $m)->makeCallback());
         $m = clone $m;
         $this->expectException(Exception::class);
-        $this->expectExceptionMessage('Object can not be cloned with hook bound to a different object than this');
+        $this->expectExceptionMessage('Object cannot be cloned with hook bound to a different object than this');
         $m->hook('inc');
     }
 

diff --git a/tests/LocalizationTest.php b/tests/LocalizationTest.php
diff --git a/tests/TranslatorAdapterAppTest.php → tests/Translator/AdapterAppTest.php b/tests/TranslatorAdapterAppTest.php → tests/Translator/AdapterAppTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Atk4\Core\Tests;
+namespace Atk4\Core\Tests\Translator;
 
 use Atk4\Core\AppScopeTrait;
 use Atk4\Core\TranslatableTrait;
 
-class TranslatorAdapterAppTest extends TranslatorAdapterBase
+class AdapterAppTest extends AdapterBaseTest
 {
     public function getTranslatableMock(): object
     {