diff --git a/app/Console/Stubs/Modules/scaffold/provider.stub b/app/Console/Stubs/Modules/scaffold/provider.stub index da0ecbc97..b5775bb5b 100644 --- a/app/Console/Stubs/Modules/scaffold/provider.stub +++ b/app/Console/Stubs/Modules/scaffold/provider.stub @@ -27,7 +27,6 @@ class $NAME$ extends Provider { $this->loadViews(); $this->loadViewComponents(); - $this->loadTranslations(); $this->loadMigrations(); } @@ -51,16 +50,6 @@ class $NAME$ extends Provider Blade::componentNamespace('$COMPONENT_NAMESPACE$', '$ALIAS$'); } - /** - * Load translations. - * - * @return void - */ - public function loadTranslations() - { - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', '$ALIAS$'); - } - /** * Load migrations. * diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 2ee3ba859..4a00833fd 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -18,14 +18,3 @@ if (version_compare(PHP_VERSION, AKAUNTING_PHP, '<')) { // Load composer for core require __DIR__ . '/../vendor/autoload.php'; - -// Load composer for modules -foreach (glob(__DIR__ . '/../modules/*') as $folder) { - $autoload = $folder . '/vendor/autoload.php'; - - if (! is_file($autoload)) { - continue; - } - - require $autoload; -} diff --git a/composer.lock b/composer.lock index d44143c90..3758fdef3 100644 --- a/composer.lock +++ b/composer.lock @@ -343,16 +343,16 @@ }, { "name": "akaunting/laravel-module", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/akaunting/laravel-module.git", - "reference": "a6d6cf4578759db636ce9063bd2c88b3ef73199a" + "reference": "848e1f38c3375bddb75229afb27d73e4fe023330" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/laravel-module/zipball/a6d6cf4578759db636ce9063bd2c88b3ef73199a", - "reference": "a6d6cf4578759db636ce9063bd2c88b3ef73199a", + "url": "https://api.github.com/repos/akaunting/laravel-module/zipball/848e1f38c3375bddb75229afb27d73e4fe023330", + "reference": "848e1f38c3375bddb75229afb27d73e4fe023330", "shasum": "" }, "require": { @@ -403,9 +403,9 @@ ], "support": { "issues": "https://github.com/akaunting/laravel-module/issues", - "source": "https://github.com/akaunting/laravel-module/tree/3.0.1" + "source": "https://github.com/akaunting/laravel-module/tree/3.0.2" }, - "time": "2023-03-16T14:48:10+00:00" + "time": "2023-10-08T17:24:14+00:00" }, { "name": "akaunting/laravel-money", @@ -852,16 +852,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.282.2", + "version": "3.283.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b9b4013f68f1bd5f219f9784c1b2a47da02c1261" + "reference": "6616677d76e39af28138512740199d38a461859f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b9b4013f68f1bd5f219f9784c1b2a47da02c1261", - "reference": "b9b4013f68f1bd5f219f9784c1b2a47da02c1261", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6616677d76e39af28138512740199d38a461859f", + "reference": "6616677d76e39af28138512740199d38a461859f", "shasum": "" }, "require": { @@ -941,9 +941,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.282.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.283.2" }, - "time": "2023-10-03T18:07:23+00:00" + "time": "2023-10-06T18:09:54+00:00" }, { "name": "balping/json-raw-encoder", @@ -2757,16 +2757,16 @@ }, { "name": "egulias/email-validator", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff" + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/3a85486b709bc384dae8eb78fb2eec649bdb64ff", - "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e", + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e", "shasum": "" }, "require": { @@ -2775,8 +2775,8 @@ "symfony/polyfill-intl-idn": "^1.26" }, "require-dev": { - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^4.30" + "phpunit/phpunit": "^10.2", + "vimeo/psalm": "^5.12" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -2812,7 +2812,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/4.0.1" + "source": "https://github.com/egulias/EmailValidator/tree/4.0.2" }, "funding": [ { @@ -2820,7 +2820,7 @@ "type": "github" } ], - "time": "2023-01-14T14:17:03+00:00" + "time": "2023-10-06T06:47:41+00:00" }, { "name": "ezyang/htmlpurifier", @@ -5804,16 +5804,16 @@ }, { "name": "league/flysystem", - "version": "3.16.0", + "version": "3.17.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729" + "reference": "bd4c9b26849d82364119c68429541f1631fba94b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4fdf372ca6b63c6e281b1c01a624349ccb757729", - "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/bd4c9b26849d82364119c68429541f1631fba94b", + "reference": "bd4c9b26849d82364119c68429541f1631fba94b", "shasum": "" }, "require": { @@ -5831,8 +5831,8 @@ "symfony/http-client": "<5.2" }, "require-dev": { - "async-aws/s3": "^1.5", - "async-aws/simple-s3": "^1.1", + "async-aws/s3": "^1.5 || ^2.0", + "async-aws/simple-s3": "^1.1 || ^2.0", "aws/aws-sdk-php": "^3.220.0", "composer/semver": "^3.0", "ext-fileinfo": "*", @@ -5878,7 +5878,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.16.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.17.0" }, "funding": [ { @@ -5890,7 +5890,7 @@ "type": "github" } ], - "time": "2023-09-07T19:22:17+00:00" + "time": "2023-10-05T20:15:05+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -7217,16 +7217,16 @@ }, { "name": "nette/schema", - "version": "v1.2.4", + "version": "v1.2.5", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab" + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/c9ff517a53903b3d4e29ec547fb20feecb05b8ab", - "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab", + "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a", + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a", "shasum": "" }, "require": { @@ -7273,9 +7273,9 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.4" + "source": "https://github.com/nette/schema/tree/v1.2.5" }, - "time": "2023-08-05T18:56:25+00:00" + "time": "2023-10-05T20:37:59+00:00" }, { "name": "nette/utils", @@ -10020,16 +10020,16 @@ }, { "name": "simple-icons/simple-icons", - "version": "9.16.1", + "version": "9.17.0", "source": { "type": "git", "url": "https://github.com/simple-icons/simple-icons.git", - "reference": "9f6f4b37a26d942da3562887e4b60715b4699122" + "reference": "43c52d2821ee41026cfcbf4f8dd5b868169f8152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simple-icons/simple-icons/zipball/9f6f4b37a26d942da3562887e4b60715b4699122", - "reference": "9f6f4b37a26d942da3562887e4b60715b4699122", + "url": "https://api.github.com/repos/simple-icons/simple-icons/zipball/43c52d2821ee41026cfcbf4f8dd5b868169f8152", + "reference": "43c52d2821ee41026cfcbf4f8dd5b868169f8152", "shasum": "" }, "type": "library", @@ -10054,7 +10054,7 @@ "type": "opencollective" } ], - "time": "2023-10-01T02:33:30+00:00" + "time": "2023-10-08T05:06:32+00:00" }, { "name": "simshaun/recurr", @@ -13392,16 +13392,16 @@ }, { "name": "brianium/paratest", - "version": "v7.2.7", + "version": "v7.2.9", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "1526eb4fd195f65075456dee394d14742ae0a66c" + "reference": "1f9e41c0779be4540654d92a9314016713f5e62c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/1526eb4fd195f65075456dee394d14742ae0a66c", - "reference": "1526eb4fd195f65075456dee394d14742ae0a66c", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/1f9e41c0779be4540654d92a9314016713f5e62c", + "reference": "1f9e41c0779be4540654d92a9314016713f5e62c", "shasum": "" }, "require": { @@ -13409,13 +13409,13 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", + "fidry/cpu-core-counter": "^0.5.1", "jean85/pretty-package-versions": "^2.0.5", "php": "~8.1.0 || ~8.2.0 || ~8.3.0", - "phpunit/php-code-coverage": "^10.1.3", - "phpunit/php-file-iterator": "^4.0.2", + "phpunit/php-code-coverage": "^10.1.7", + "phpunit/php-file-iterator": "^4.1.0", "phpunit/php-timer": "^6.0", - "phpunit/phpunit": "^10.3.2", + "phpunit/phpunit": "^10.4.0", "sebastian/environment": "^6.0.1", "symfony/console": "^6.3.4", "symfony/process": "^6.3.4" @@ -13424,8 +13424,8 @@ "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "infection/infection": "^0.27.0", - "phpstan/phpstan": "^1.10.32", + "infection/infection": "^0.27.3", + "phpstan/phpstan": "^1.10.37", "phpstan/phpstan-deprecation-rules": "^1.1.4", "phpstan/phpstan-phpunit": "^1.3.14", "phpstan/phpstan-strict-rules": "^1.5.1", @@ -13471,7 +13471,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.2.7" + "source": "https://github.com/paratestphp/paratest/tree/v7.2.9" }, "funding": [ { @@ -13483,7 +13483,7 @@ "type": "paypal" } ], - "time": "2023-09-14T14:10:09+00:00" + "time": "2023-10-06T07:53:04+00:00" }, { "name": "fakerphp/faker", @@ -14086,16 +14086,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.6", + "version": "10.1.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "56f33548fe522c8d82da7ff3824b42829d324364" + "reference": "355324ca4980b8916c18b9db29f3ef484078f26e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/56f33548fe522c8d82da7ff3824b42829d324364", - "reference": "56f33548fe522c8d82da7ff3824b42829d324364", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e", + "reference": "355324ca4980b8916c18b9db29f3ef484078f26e", "shasum": "" }, "require": { @@ -14152,7 +14152,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.6" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.7" }, "funding": [ { @@ -14160,7 +14160,7 @@ "type": "github" } ], - "time": "2023-09-19T04:59:03+00:00" + "time": "2023-10-04T15:34:17+00:00" }, { "name": "phpunit/php-file-iterator", @@ -14407,16 +14407,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.3.5", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503" + "reference": "62bd7af13d282deeb95650077d28ba3600ca321c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/747c3b2038f1139e3dcd9886a3f5a948648b7503", - "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/62bd7af13d282deeb95650077d28ba3600ca321c", + "reference": "62bd7af13d282deeb95650077d28ba3600ca321c", "shasum": "" }, "require": { @@ -14456,7 +14456,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.3-dev" + "dev-main": "10.4-dev" } }, "autoload": { @@ -14488,7 +14488,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.3.5" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.4.1" }, "funding": [ { @@ -14504,7 +14504,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:42:37+00:00" + "time": "2023-10-08T05:01:11+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/module.php b/config/module.php index f6f5ee6de..ccec1175a 100644 --- a/config/module.php +++ b/config/module.php @@ -175,19 +175,16 @@ return [ /* |-------------------------------------------------------------------------- - | Choose what module will register as custom namespaces. - | Setting one to false will require you to register that part - | in your own Service Provider class. + | Autoload |-------------------------------------------------------------------------- + | + | Here is the load classes config. + | */ - 'register' => [ - 'translations' => true, - /** - * load files on boot or register method - * - * @example boot|register - */ - 'files' => 'register', + 'autoload' => [ + 'translations' => true, + 'files' => 'register', + 'composer' => 'register', ], ];