update to oxygen/core 1.0.0 (#13)

Author: neon64

.github/workflows/php.yml

@@ -27,7 +27,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }}
         restore-keys: |
           ${{ runner.os }}-php-
 

composer.json

@@ -15,10 +15,8 @@
     ],
     "require": {
         "php": ">=8.1",
-        "oxygen/core": "~0.15.0",
-        "oxygen/crud": "~0.14.0",
+        "oxygen/core": "~1.0.0",
         "oxygen/data": "~0.12.0",
-        "oxygen/preferences": "~0.6.0",
         "illuminate/support": "^10.0",
         "laravel/sanctum": "^3.2",
         "guzzlehttp/guzzle": "^7.4.5",

migrations/2015_07_07_000000_create_auth_preferences.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
-use Oxygen\Preferences\Loader\PreferenceRepositoryInterface;
+use Oxygen\Core\Preferences\Loader\PreferenceRepositoryInterface;
 
 class CreateAuthPreferences extends Migration {
 

migrations/2021_06_27_000000_create_auth_modules.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
-use Oxygen\Preferences\PreferencesManager;
+use Oxygen\Core\Preferences\PreferencesManager;
 
 class CreateAuthModules extends Migration {
 

resources/preferences/appearance.auth.php

@@ -1,8 +1,9 @@
 <?php
 
 use Illuminate\Validation\Rule;
-use Oxygen\Preferences\Loader\PreferenceRepositoryInterface;
-use Oxygen\Preferences\Loader\DatabaseLoader;
+use Oxygen\Core\Facades\Preferences;
+use Oxygen\Core\Preferences\Loader\PreferenceRepositoryInterface;
+use Oxygen\Core\Preferences\Loader\DatabaseLoader;
 
 Preferences::register('appearance.auth', function($schema) {
     $schema->setTitle('Login & Logout');

resources/preferences/modules.auth.php

@@ -1,8 +1,9 @@
 <?php
 
 use Illuminate\Routing\Router;
-use Oxygen\Preferences\Loader\PreferenceRepositoryInterface;
-use Oxygen\Preferences\Loader\DatabaseLoader;
+use Oxygen\Core\Facades\Preferences;
+use Oxygen\Core\Preferences\Loader\PreferenceRepositoryInterface;
+use Oxygen\Core\Preferences\Loader\DatabaseLoader;
 
 Preferences::register('modules.auth', function($schema) {
     $schema->setTitle('Authentication');

resources/preferences/user.php

@@ -1,3 +1,5 @@
 <?php
 
+use Oxygen\Core\Facades\Preferences;
+
 Preferences::addGroup('user', 'User');

src/AuthServiceProvider.php

@@ -32,8 +32,8 @@
 use Oxygen\Auth\Repository\UserRepositoryInterface;
 use Oxygen\Core\Permissions\PermissionsInterface;
 use Oxygen\Data\BaseServiceProvider;
-use Oxygen\Preferences\PreferencesManager;
-use Oxygen\Preferences\SchemaRegistered;
+use Oxygen\Core\Preferences\PreferencesManager;
+use Oxygen\Core\Preferences\SchemaRegistered;
 use Oxygen\Auth\Listeners\EnforceTwoFactorAuth;
 
 class AuthServiceProvider extends BaseServiceProvider {

src/Controller/AuthController.php

@@ -19,8 +19,8 @@
 use Oxygen\Auth\Entity\User;
 use Oxygen\Auth\Repository\UserRepositoryInterface;
 use Oxygen\Data\Exception\InvalidEntityException;
-use Oxygen\Preferences\PreferenceNotFoundException;
-use Oxygen\Preferences\PreferencesManager;
+use Oxygen\Core\Preferences\PreferenceNotFoundException;
+use Oxygen\Core\Preferences\PreferencesManager;
 use Illuminate\Routing\Controller;
 use Oxygen\Core\Http\Notification;
 use Illuminate\Http\Exceptions\HttpResponseException;

src/Controller/GroupsController.php

@@ -4,17 +4,16 @@
 
 use Illuminate\Routing\Controller;
 use Oxygen\Auth\Repository\GroupRepositoryInterface;
-use OxygenModule\Auth\Fields\GroupFieldSet;
-use Oxygen\Crud\Controller\BasicCrudApi;
-use Oxygen\Crud\Controller\SoftDeleteCrudApi;
+use Oxygen\Core\Controller\BasicCrudTrait;
+use Oxygen\Core\Controller\SoftDeleteCrudTrait;
 use Webmozart\Assert\Assert;
 
 class GroupsController extends Controller {
 
-    use BasicCrudApi, SoftDeleteCrudApi {
-        SoftDeleteCrudApi::deleteDeleteApi insteadof BasicCrudApi;
+    use BasicCrudTrait, SoftDeleteCrudTrait {
+        SoftDeleteCrudTrait::deleteDeleteApi insteadof BasicCrudTrait;
         // we don't care about filtering by deleted status here
-        BasicCrudApi::getListQueryParameters insteadof SoftDeleteCrudApi;
+        BasicCrudTrait::getListQueryParameters insteadof SoftDeleteCrudTrait;
     }
 
     const PER_PAGE = 50;
@@ -34,7 +33,7 @@ class GroupsController extends Controller {
     public function __construct(GroupRepositoryInterface $repository) {
         $this->repository = $repository;
         Assert::isInstanceOf($this->repository, GroupRepositoryInterface::class);
-        BasicCrudApi::setupLangMappings(self::LANG_MAPPINGS);
+        BasicCrudTrait::setupLangMappings(self::LANG_MAPPINGS);
     }
 
 }