Luke Towers
e94fd84177
finalize composer.json for develop
2021-03-11 10:08:54 -06:00
Luke Towers
c047f34156
Merge branch 'wip/rebrand-1.0' into wip/rebrand-develop
...
# Conflicts:
# .github/workflows/code-quality-pr.yaml
# .github/workflows/code-quality-push.yaml
# .github/workflows/tests.yml
# README.md
# composer.json
# modules/backend/behaviors/ImportExportController.php
# modules/backend/behaviors/ReorderController.php
# modules/backend/composer.json
# modules/backend/models/ExportModel.php
# modules/cms/ServiceProvider.php
# modules/cms/classes/Asset.php
# modules/cms/classes/CmsObject.php
# modules/cms/classes/CmsObjectCollection.php
# modules/cms/composer.json
# modules/system/ServiceProvider.php
# modules/system/aliases.php
# modules/system/assets/js/lang/lang.es.js
# modules/system/assets/js/lang/lang.it.js
# modules/system/assets/js/lang/lang.zh-tw.js
# modules/system/assets/ui/storm-min.js
# modules/system/classes/CombineAssets.php
# modules/system/classes/ErrorHandler.php
# modules/system/classes/SystemController.php
# modules/system/classes/UpdateManager.php
# modules/system/composer.json
# modules/system/console/WinterFresh.php
# modules/system/console/WinterUtil.php
# modules/system/controllers/updates/_list_toolbar.htm
# modules/system/providers.php
# tests/UiTestCase.php
# tests/functional/backend/AuthTest.php
# tests/functional/phpunit.xml
# tests/unit/backend/classes/NavigationManagerTest.php
# tests/unit/cms/classes/CmsObjectTest.php
# tests/unit/cms/classes/ControllerTest.php
# tests/unit/cms/classes/ThemeTest.php
# tests/unit/plugins/database/PluginModelTest.php
# tests/unit/plugins/database/ValidationModelTest.php
# tests/unit/system/console/WinterEnvTest.php
2021-03-11 00:22:09 -06:00
Ben Thomson
05222755b2
Fix missing Storm dependency
2021-03-11 13:03:22 +08:00
Ben Thomson
42374293ed
Add Composer changes directly to develop so we can get Composer going
2021-03-11 13:00:46 +08:00
Luke Towers
57b8702b1e
re-add modules to composer.json
2021-03-10 13:25:26 -06:00
Luke Towers
88d45bb191
Add aliasing support to AuthManager permission registration and fixed an issue where the permission cache wasn't cleared after changing the available permissions
2021-03-10 02:36:38 -06:00
Ben Thomson
00968a42ba
Move include priority plugin to require-dev
2021-03-09 10:48:05 +08:00
Ben Thomson
a705f9ba4d
Ensure Storm's helpers are given higher priority than Laravel's helpers
2021-03-08 22:00:38 +08:00
Luke Towers
8186fcb1e1
temporarily remove modules from composer.json file to check tests status
2021-03-08 03:02:02 -06:00
Luke Towers
75facce841
Fix composer
2021-03-08 03:01:31 -06:00
Luke Towers
d52ea0ccf8
further WIP on rebrand
2021-03-08 02:41:13 -06:00
Luke Towers
7d80b771fe
Initial work on Winter rebrand for 1.0 branch
2021-03-06 04:06:19 -06:00
Luke Towers
5c4bebccc5
Fix Composer 2.0 support.
...
Credit to @VolCh
2021-03-06 02:52:09 -06:00
Ben Thomson
5c757340ae
Adjust dev dependencies
...
- No longer need AssertGD in main repo, as it was only used for library tests.
- Allow different version of ArraySubset asserts depending on PHP version
2021-03-01 22:57:02 +08:00
Ben Thomson
24a49890cd
Remove platform lock for PHP version.
...
Since we are now relying on different versions of some dependencies depending on whether PHP 7 or 8 is used, we can no longer lock the PHP version down.
2021-03-01 22:51:28 +08:00
Ben Thomson
e9e29c05cf
Force PHP version 7.2.9 as per PHP 8 changes to library
2021-03-01 22:44:25 +08:00
Ben Thomson
09b07dcbab
Merge remote-tracking branch 'origin/develop' into wip/php-8-testing
2021-03-01 22:39:35 +08:00
Luke Towers
6a9e60dd49
Update PHP platform to support Laravel 6.20+
...
Refs: b1555ed43f
2021-02-15 02:54:00 -06:00
Tolkam
26b231cad9
PHP 8 compatibility fixes ( #5454 )
...
Co-authored-by: Kanstantsin K <kk@tolkam.by>
2021-02-04 11:59:44 +08:00
Ben Thomson
cb06f5965a
Backport fix to drop library tests from October CMS test suite.
...
Refs: 505b1ce0db
2021-01-13 10:17:39 +08:00
Ben Thomson
505b1ce0db
Drop Rain tests from main October CMS test suite ( #5449 )
...
The Rain library is separately tested with a TestCase base class which does not instantiate an application. This removes the conflict caused from the TestCase class which is within October CMS itself, which instantiates an applications and handles things differently.
2021-01-13 10:13:27 +08:00
Luke Towers
4c068bd506
fix tests again
2021-01-04 17:29:48 -06:00
Luke Towers
3f5dcde710
Fix tests by using composer v1
2021-01-04 17:17:39 -06:00
Luke Towers
873fce4603
backport composer.json fixes for composer 2.0
2021-01-04 13:11:47 -06:00
Ben Thomson
825ca91de9
Include DbTestCase from Rain library in autoloader
...
Ensures that the tests in the main October repo still run.
2020-11-23 22:50:12 +08:00
Luke Towers
a095c1e545
temporary fix for Composer 2.0 compatibility.
...
See https://github.com/wikimedia/composer-merge-plugin/pull/189
2020-11-22 04:37:42 -06:00
Ben Thomson
fffa6db8d8
Add Mockery as dev dependency, limit PHPUnit versions
2020-11-03 09:51:23 +08:00
Luke Towers
6389554935
fix composer for 1.1
2020-09-06 21:43:20 -06:00
Ben Thomson
4141646105
Implement improved "set build" replacement ( #5087 )
...
This change implements an improved "set build" utility through the "october:version" Artisan command that, instead of checking the October CMS server for the latest build, checks the module files against a source manifest kept on GitHub.
This check allows us to accurately determine the build based on the module files in the October CMS installation, and can even detect versions if the module files are modified (except in the cases of extreme modification).
An additional utility has been implemented, "october:manifest", which will build the manifest JSON file in order to provide the maintainers with a way of generating this manifest file as required.
Replaces #4615 .
2020-09-02 14:48:08 +08:00
Luke Towers
871c27b8f3
L6 finalizing for merging to develop
2020-08-09 03:31:32 -06:00
Luke Towers
18714ae9f0
Add L6 as a dep to the modules to prevent people with older Laravel versions from accidentally pulling in the L6 update
2020-07-19 01:42:58 -06:00
Ben Thomson
83137dafb8
Remove Dusk "don't discover" flag
...
Will be fixed instead by https://github.com/octobercms/library/pull/492 when it is merged.
2020-06-23 11:04:25 +08:00
Luke Towers
79f0a9413b
Merge branch 'develop' into wip/laravel-6
...
# Conflicts:
# composer.json
2020-03-31 04:36:47 -06:00
Luke Towers
2bc4084dff
Fixed composer requirement
...
Composer does not support commit specific requirements when it comes to fetching the composer.json metadata, which means that this particular fix has to specify a tag instead of a commit hash.
2020-03-31 00:54:56 -06:00
Luke Towers
8979d50593
Lock wikimedia/composer-merge-plugin to version that still supported PHP 7.0-7.2.
...
Support was removed in d21d197a60
2020-03-31 00:46:50 -06:00
Ben Thomson
ef606c76c5
Merge branch 'develop' into wip/laravel-6
2020-03-27 14:52:15 +08:00
Ben Thomson
61cadeb623
Switch PHP Parallel Lint provider.
...
jakub-onderka/php-parallel-lint has been abandoned, and the original author has recommended swithcing to php-parallel-lint/php-parallel-lint.
Fixes #5007 .
2020-03-27 14:48:45 +08:00
Samuel Georges
54b70f6b32
Update composer to suit latest changes
2020-02-27 20:07:42 +11:00
Ben Thomson
cb061fe7fe
Remove Dusk from dev dependencies
2020-02-13 16:49:03 +08:00
Ben Thomson
1b8f0cc376
Fix autoload map for tests
2020-02-13 15:39:42 +08:00
Ben Thomson
6b114bf3b2
Drop PHPUnit Selenium requirement
2020-02-03 12:44:45 +08:00
Ben Thomson
65c3a88179
[Laravel 6] Add support for Laravel Dusk tests ( #4919 )
2020-02-03 12:21:04 +08:00
Luke Towers
5f89a6cd4e
Update composer file to use new subsplit repos
2020-01-27 12:06:19 -06:00
Graham Campbell
ab1df6e719
Fixed bad version constraint
2020-01-21 22:56:28 +00:00
Ben Thomson
0c2dc29f22
Add Discord URL
2020-01-21 08:50:44 +08:00
Ben Thomson
0a63720335
Add JUST the Composer scripts
2020-01-20 16:15:20 +08:00
Ben Thomson
86351cec7f
Revert "Add Composer scripts"
...
This reverts commit a1cfc2aa58c2fa88c186a4306381fdcf1cd4f269.
2020-01-20 16:14:00 +08:00
Ben Thomson
a1cfc2aa58
Add Composer scripts
2020-01-20 16:08:15 +08:00
Ben Thomson
e81101c875
Use updated branch name for library
2020-01-20 11:51:08 +08:00
Ben Thomson
74cc4d4666
Updated Composer dependencies for L6.
...
Temporarily removed the October subsplits until they are supporting L6.
2020-01-19 16:28:20 +08:00
