8.x

.github/workflows/quality.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php
         with:
-          php-version: 7.2
+          php-version: 8.3
           extension-csv: mbstring, dom, fileinfo, mysql, zip
           coverage: xdebug #optional
       - name: Get composer cache directory
@@ -24,8 +24,9 @@ jobs:
       - name: Install Composer dependencies
         run: |
             composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-            composer global require amethyst/cli
+            composer require --dev phpstan/phpstan
       - name: Test Quality
         run: |
-            export PATH="$HOME/.composer/vendor/bin:$PATH"
-            amethyst test:phpstan --verbose
+          export PATH="$HOME/.composer/vendor/bin:$PATH"
+          ./vendor/bin/phpstan analyse --level=0 src
+          ./vendor/bin/phpstan analyse --level=0 tests

.github/workflows/style.yml

@@ -11,22 +11,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
+        uses: actions/checkout@v4
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php
+        with:
+          php-version: 8.3
+          extension-csv: mbstring, dom, fileinfo, mysql, zip
+          coverage: xdebug #optional
       - name: Install Composer dependencies
         run: |
           composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-          composer global require amethyst/cli
+          composer require --dev friendsofphp/php-cs-fixer
 
       - name: Run fix:style
         run: |
           export PATH="$HOME/.composer/vendor/bin:$PATH"
-          amethyst fix:style --verbose
+          ./vendor/bin/php-cs-fixer fix src
+          ./vendor/bin/php-cs-fixer fix tests
 
       - uses: stefanzweifel/git-auto-commit-action@v2.1.0
         with:
           commit_message: Apply style changes
           branch: ${{ github.ref }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       DB_DATABASE: laravel
       DB_USERNAME: root
       DB_PASSWORD: password
-      BROADCAST_DRIVER: log
+      BROADCAST_DRIVER: log 
     services:
       mysql:
         image: mysql:5.7
@@ -27,17 +27,19 @@ jobs:
         ports:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      redis:
+        image: redis
+        ports:
+          - 6379/tcp
+        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.2', '7.3', '7.4']
-        laravel: ['5.8.*', '6.*', '7.*', '8.*']
-        exclude:
-          - php: '7.2'
-            laravel: '8.*'
+        php: ['8.2', '8.3']
+        laravel: ['9.*', '10.*']
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php
         with:
@@ -49,13 +51,12 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Install Composer dependencies
         run: |
-            composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-            composer require --dev amethyst/cli
-            composer require --dev "laravel/framework:${{ matrix.laravel }}" --no-update;
+          composer require --dev "laravel/framework:${{ matrix.laravel }}" --no-update
+          composer update --no-progress --no-suggest --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Test
-        run: vendor/bin/amethyst test:phpunit --verbose
+        run: ./vendor/bin/phpunit --coverage-text --coverage-clover=build/logs/clover.xml
         env:
           DB_PORT: ${{ job.services.mysql.ports['3306'] }}

.gitignore

@@ -1,9 +1,9 @@
 vendor/
-var/
 \.php_cs\.cache
+build/
 \.env
 composer\.lock
-build/
-phpunit\.xml
-
 .phpunit.result.cache
+phpunit.xml
+.php-cs-fixer.cache
+.phpunit.cache/test-results

README.md

@@ -1,12 +1,11 @@
 # amethyst-attribute
 
-[![Action Status](https://github.com/amethyst-php/attribute/workflows/Test/badge.svg)](https://github.com/amethyst-php/attribute/actions)
-
+[![Action Status](https://github.com/amethyst-php/attribute/workflows/Test/badge.svg)](https://github.com/amethyst-php/attribute/actions)./vendor
 [Amethyst](https://github.com/amethyst-php/amethyst) package.
 
 # Requirements
 
-PHP 7.1 and later.
+PHP 7.2 and later.
 
 ## Installation
 

composer.json

@@ -4,15 +4,14 @@
     "keywords": ["laravel", "amethyst", "amethyst-attribute-schema", "attribute-schema"],
     "license": "MIT",
     "require": {
-        "php": ">=7.2",
-        "amethyst/core": "0.2.*",
-        "amethyst/relation-schema": "0.2.*",
+        "php": ">=8.2",
+        "amethyst/core": "0.3.*",
+        "amethyst/relation-schema": "0.3.*",
         "doctrine/dbal": "^2.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
         "orchestra/testbench": "*",
-        "amethyst/foo": "0.2.*"
+        "amethyst/foo": "0.3.*"
     },
     "autoload": {
         "psr-4" : {

phpunit.xml.dist

@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
         <testsuite name="Application Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+    <source>
+        <include>
+          <directory suffix=".php">./src</directory>
+        </include>
+    </source>
     <php>
         <env name="APP_ENV" value="testing"/>
     </php>

src/Observers/AttributeSchemaObserver.php

@@ -79,6 +79,8 @@ public function updating(AttributeSchema $attributeSchema, bool $onChange = true
 
             $arguments = $attributeSchema->getResolver()->getDatabaseArguments();
 
+            print_r($method);
+
             $column = $table->$method(...$arguments);
 
             $attributeSchema->getResolver()->callDatabaseOptions($column);
@@ -223,12 +225,16 @@ public function convertAttributeOptionsToRelationPayload(AttributeSchema $attrib
             }
         }
 
+        if (!empty($payload->ownerKey)) {
+            $obj['ownerKey'] = $payload->ownerKey;
+        }
+
         if (!empty($payload->relationKey)) {
-            $obj['foreignKey'] = $payload->relationKey;
+            $obj['keyName'] = $payload->relationKey;
         }
 
-        if (!empty($payload->ownerKey)) {
-            $obj['ownerKey'] = $payload->ownerKey;
+        if ($attributeSchema->schema === 'MorphTo') {
+            $obj['keyId'] = $attributeSchema->name;
         }
 
         return Yaml::dump($obj);

tests/BaseTest.php → tests/BaseTestCase.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests;
 
-abstract class BaseTest extends \Orchestra\Testbench\TestCase
+abstract class BaseTestCase extends \Orchestra\Testbench\TestCase
 {
     /**
      * Setup the test environment.
@@ -14,7 +14,6 @@ public function setUp(): void
         $this->artisan('migrate:fresh');
 
         app('amethyst.attribute-schema')->boot();
-        app('amethyst.relation-schema')->boot();
         app('eloquent.mapper')->boot();
     }
 

tests/Managers/AttributeSchemaBelongsToTest.php

@@ -6,7 +6,7 @@
 use Amethyst\Managers\FooManager;
 use Symfony\Component\Yaml\Yaml;
 
-class AttributeSchemaBelongsToTest extends AttributeSchemaCommonTest
+class AttributeSchemaBelongsToTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicBelongsTo()
     {

tests/Managers/AttributeSchemaCommonTest.php → tests/Managers/AttributeSchemaCommonTestCase.php

@@ -6,9 +6,9 @@
 use Amethyst\Managers\AttributeSchemaManager;
 use Amethyst\Managers\FooManager;
 use Amethyst\Models\Foo;
-use Amethyst\Tests\BaseTest;
+use Amethyst\Tests\BaseTestCase;
 
-abstract class AttributeSchemaCommonTest extends BaseTest
+abstract class AttributeSchemaCommonTestCase extends BaseTestCase
 {
     public function resetFields()
     {
@@ -32,7 +32,7 @@ public function commonField($name, $type, $valid = [], $invalid = [], $options =
         foreach ($valid as $v) {
             $parameters = FooFaker::make()->parameters();
             $parameters->add(is_array($v) ? $v : [$name => $v]);
-
+            
             $foo = $fooManager->createOrFail($parameters)->getResource();
             $foo->save();
 

tests/Managers/AttributeSchemaDataNameTest.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests\Managers;
 
-class AttributeSchemaDataNameTest extends AttributeSchemaCommonTest
+class AttributeSchemaDataNameTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicDate()
     {

tests/Managers/AttributeSchemaDateTest.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests\Managers;
 
-class AttributeSchemaDateTest extends AttributeSchemaCommonTest
+class AttributeSchemaDateTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicDate()
     {

tests/Managers/AttributeSchemaDateTimeTest.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests\Managers;
 
-class AttributeSchemaDateTimeTest extends AttributeSchemaCommonTest
+class AttributeSchemaDateTimeTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicDateTime()
     {

tests/Managers/AttributeSchemaEmailTest.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests\Managers;
 
-class AttributeSchemaEmailTest extends AttributeSchemaCommonTest
+class AttributeSchemaEmailTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicEmail()
     {

tests/Managers/AttributeSchemaEnumTest.php

@@ -4,7 +4,7 @@
 
 use Symfony\Component\Yaml\Yaml;
 
-class AttributeSchemaEnumTest extends AttributeSchemaCommonTest
+class AttributeSchemaEnumTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicEnum()
     {

tests/Managers/AttributeSchemaLongTextTest.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests\Managers;
 
-class AttributeSchemaLongTextTest extends AttributeSchemaCommonTest
+class AttributeSchemaLongTextTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicLongText()
     {

tests/Managers/AttributeSchemaMorphToTest.php

@@ -3,16 +3,21 @@
 namespace Amethyst\Tests\Managers;
 
 use Symfony\Component\Yaml\Yaml;
+use Amethyst\Managers\FooManager;
+use Amethyst\Fakers\FooFaker;
 
-class AttributeSchemaMorphToTest extends AttributeSchemaCommonTest
+class AttributeSchemaMorphToTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicMorphTo()
     {
         $this->resetFields();
 
         $foos = $this->commonField('target_key', 'DataName', ['foo'], ['invalidName']);
+
+        $fooManager = new FooManager();
+        $foo = $fooManager->createOrFail(FooFaker::make()->parameters())->getResource();
 
-        $this->commonField('target_id', 'MorphTo', [['target_key' => 'foo', 'target_id' => $foos[0]->id]], [999], Yaml::dump([
+        $this->commonField('target_id', 'MorphTo', [['target_key' => 'foo', 'target_id' => $foo->id]], [999], Yaml::dump([
             'relationName' => 'target',
             'relationKey'  => 'target_key',
         ]));

tests/Managers/AttributeSchemaNumberTest.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests\Managers;
 
-class AttributeSchemaNumberTest extends AttributeSchemaCommonTest
+class AttributeSchemaNumberTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicNumber()
     {

tests/Managers/AttributeSchemaRequiredTest.php

@@ -6,7 +6,7 @@
 use Amethyst\Managers\AttributeSchemaManager;
 use Amethyst\Managers\FooManager;
 
-class AttributeSchemaRequiredTest extends AttributeSchemaCommonTest
+class AttributeSchemaRequiredTest extends AttributeSchemaCommonTestCase
 {
     public function testRequired()
     {

tests/Managers/AttributeSchemaTest.php

@@ -4,10 +4,10 @@
 
 use Amethyst\Fakers\AttributeSchemaFaker;
 use Amethyst\Managers\AttributeSchemaManager;
-use Amethyst\Tests\BaseTest;
+use Amethyst\Tests\BaseTestCase;
 use Railken\Lem\Support\Testing\TestableBaseTrait;
 
-class AttributeSchemaTest extends BaseTest
+class AttributeSchemaTest extends BaseTestCase
 {
     use TestableBaseTrait;
 

tests/Managers/AttributeSchemaTextTest.php

@@ -2,7 +2,7 @@
 
 namespace Amethyst\Tests\Managers;
 
-class AttributeSchemaTextTest extends AttributeSchemaCommonTest
+class AttributeSchemaTextTest extends AttributeSchemaCommonTestCase
 {
     public function testBasicText()
     {