93 Commits

Author SHA1 Message Date
Samuel Georges
7a925f43a9 Remove merge plugin config
No longer needed, see previous commit
2021-03-13 10:44:47 +11:00
Samuel Georges
de897f9748 Remove composer-merge plugin
There was never any good reason to include this, since plugins are installed by

- composer: where dependencies become merged
- gateway: where dependencies are already included
- developers (A): include a custom repo in composer
- developers (B): run composer update in the plugin directory

It makes the system unpredictable and needlessly complex. Also there are reports of it slowing down composer
2021-03-12 07:20:36 +11:00
Vladimir Chernyshev
16ed9705a9
Permanent Composer 2 compatibility (#5506) 2021-03-05 18:21:40 +11:00
Ben Thomson
92ab25c582
PHP 8 compatibility (#5357)
PHP support
2021-03-05 18:20:44 +11:00
Samuel Georges
a3bf139d64 Clarify IP ownership
Luke Towers did not author October CMS
2021-03-04 14:58:22 +11:00
Luke Towers
6a9e60dd49
Update PHP platform to support Laravel 6.20+
Refs: b1555ed43f
2021-02-15 02:54:00 -06: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
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 (and later relaxed to 7.2.0 as a minimum requirement in the next commit). This change should be reverted when the L6 upgrade is merged in.
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
Luke Towers
9bfdf6236b
Bump minimum version of Laravel required
Laravel made a breaking change to the EncryptCookies middleware, this makes it explicit that we require at least 5.5.40.
2019-12-18 16:29:57 -06:00
Samuel Georges
9b77e8d81a Bump min requirements to 7.0.8
This fixes PHP 7.4 support by pulling in Symfony packages at v3.4.36
2019-12-09 20:30:48 +11:00
Samuell
348040a4e4 Add permission support for fields, columns and filter scopes (#4520)
Credit to @Samuell1. Fixes #1837.
2019-10-09 16:41:53 -06:00
Luke Towers
d64875530d Update composer.json 2019-08-15 09:39:49 -06:00
Ben Thomson
6fb6e5f71c
Improve Travis CI build process (#4394) 2019-06-24 07:38:41 +08:00
Denis Denisov
c7cdd0dce4 Add support for package discovery (#4162)
Fixes #4149. Credit to @w20k
2019-04-19 16:38:55 -06:00
GitLog
a20f2bfe69 Fix (Trait 'AssertGD\GDAssertTrait' not found) (#3824)
Credit to @gitlog
2018-09-26 09:19:42 -06:00
Samuel Georges
f12f3af37f By default assert the app will want 7.0 packages
This addresses an issue with Symfony and a trajectory towards towards DLL hell (see Ruby on Rails). October imports Laravel that then imports Symfony for the translation packages. These packages are subjective to the PHP version running at the time. When running PHP 7.1 a version of the package is included that is incompatible with PHP 7.0. Whilst clever, it is far from simple.

If problems are encountered by this change, simply customise your composer.json file to remove it.
2018-08-16 12:18:16 +10:00
Luke Towers
4f7a08954d Updating links in composer files 2018-04-16 02:33:08 -06:00
Samuel Georges
4eab0670c4 Proxy ConsoleSupportServiceProvider properly
Refs https://github.com/octobercms/october/pull/3353
Refs https://github.com/octobercms/october/issues/3321
Refs https://github.com/octobercms/october/pull/3328
Refs https://github.com/octobercms/october/issues/3359
2018-01-24 18:09:41 +11:00
buuug7
df96c65b3c Generate .env file before generating application key (#3353)
Fixes #3321. Credit to @buuug7
2018-01-12 16:59:21 -06:00
Pierre-André Vullioud
de9804c897 Update Faker to 1.7 (#3174)
a lot of improvements from 1.4 like :
Language specific formatters
https://github.com/fzaninotto/Faker#language-specific-formatters
a new formats.
2017-10-16 08:59:40 -06:00
Samuel Georges
4074ad8cc9 Laravel 5.5 released 2017-08-31 20:57:00 +10:00
Samuel Georges
ef191d64e4 l55upgrade -> develop 2017-07-26 21:03:52 +10:00
Samuel Georges
78d722adf0 Set last build number, updating via composer 2017-07-14 22:01:11 +10:00
Luke Towers
613ebf090d Re-add the merge plugin
@daftspunk I readded the merge plugin accidentally removed in: db82bfa815
2017-06-06 09:28:50 -06:00
Samuel Georges
db82bfa815 Tighten up font weight and login screen
Recompile assets
2017-05-30 20:10:48 +10:00