Commit Graph

156 Commits

Author SHA1 Message Date
Garion Herman
4ea1f7082b MNT Add PHP 8 builds 2020-10-14 14:31:51 +13:00
Maxime Rainville
27231bf315 BUG Treat login-forms as a core module 2020-06-30 22:14:55 +12:00
Garion Herman
46f687ab5a Merge branch '4.5' into 4 2020-03-03 15:20:24 +13:00
Garion Herman
6851935652 Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat 2020-02-26 16:45:52 +13:00
Ingo Schommer
87ae55539e
Merge branch '4' into pulls/4/login-forms 2019-12-11 15:46:06 +13:00
Serge Latyntcev
a3bc3d80c5 RFC-9344 Remove branch aliases 2019-12-09 10:58:15 +13:00
Serge Latyntcev
3bf4d1f34c Update branch alias, requirements and travis config 2019-11-29 12:00:14 +13:00
Serge Latyntcev
e3230a7371 Remove obsolete branch-alias 2019-11-14 01:24:53 +00:00
Ingo Schommer
c1d94643a4
Set looser composer constraint
As per discussion with Guy on https://github.com/silverstripe/silverstripe-installer/pull/257. Will pull in stable tags via cow once they're available (on recipe release)
2019-07-16 11:23:54 +12:00
Ingo Schommer
9171342ec2 NEW Add silverstripe/login-forms
Using beta tag for now, should move to stable once the module is stable (ideally before 4.5.0)
2019-07-05 16:45:11 +12:00
Robbie Averill
002cb6b61d API Bump minimum PHP version to 7.1 2019-05-23 13:59:31 +12:00
Ingo Schommer
3e7294ea70
Bump to 4.5.x-dev
This conflicts with an earlier commit (cfba4cb), but after talking to Robbie this new commit is consistent with how we handle other recipes (CWP and core). Both ways are viable, but we've implicitly standardised on this way (set minor release constraints in the main release branch, e.g. constraint to recipe:4.5.x-dev on installer:4.x-dev)
2019-04-30 11:03:06 +12:00
Ingo Schommer
cfba4cbe36
Fixed core dependency to 4.x-dev
Likely caused by repeated unreviewed merges from 4.4 (and 4.3) onto the 4 branch here (e.g. through fa67bc614b).

Note this isn't changing the branch alias, which should still point to 4.5.x-dev here.
2019-04-30 09:21:53 +12:00
Robbie Averill
83f78fc40e Merge branch '4.4' into 4 2019-04-21 10:33:04 +12:00
Robbie Averill
c0d9fd4869 Remove obsolete branch alias 2019-04-21 10:30:43 +12:00
Robbie Averill
810f719f86 Revert "NEW Add Roave Security advisories to composer"
This reverts commit a302acfa5a.
2019-02-26 09:19:08 +11:00
Maxime Rainville
0f02f2364f MINOR Make installer default to using _resources (#242) 2019-01-16 21:34:13 +13:00
Simon Erkelens
a302acfa5a
NEW Add Roave Security advisories to composer
Add Security Advisories as dev requirement to
- Prevent installation of known breached libraries
- Give devs the option to remove it if they might want to
2019-01-08 09:37:34 +13:00
Robbie Averill
fa67bc614b Bump branch alias and root version in Travis to 4.4.x-dev 2018-10-15 14:54:38 +02:00
Robbie Averill
05fd5a9a96 Bump branch alias and root version in Travis to 4.4.x-dev 2018-10-15 14:44:14 +02:00
Damian Mooyman
5e4ad34162
Fix incorrect base recipe dependency 2018-06-15 16:47:59 +12:00
Damian Mooyman
f5b659cb4f
Merge remote-tracking branch 'origin/4.2' into 4 2018-06-15 16:06:14 +12:00
Damian Mooyman
6a7bd05a1d Remove obsolete branch-alias 2018-06-15 15:30:04 +12:00
Damian Mooyman
97ef910478
Update installer to use new recipe versioning 2018-06-14 13:29:03 +12:00
Robbie Averill
a9e2af6863 FIX Remove incorrect classmap for Page and PageController
These files to not always exist in this path, so this autoload definition is misleading
2018-06-01 15:54:11 +12:00
Damian Mooyman
7cfaeccfb1
Remove empty psr-4 2018-04-13 10:15:04 +12:00
Damian Mooyman
f514ba42b6
Bump recipe plugin dependency 2018-04-05 16:43:07 +12:00
Damian Mooyman
0b71d14fe1
Shift resources into app folder
Add autoloading skeleton and classmap for Page.php / PageController.php
2018-04-05 15:17:03 +12:00
Damian Mooyman
30df0f5e43
Merge remote-tracking branch 'origin/4.1' into 4 2018-02-07 16:44:41 +13:00
Damian Mooyman
7fb7f885f9
Update branch alias 2018-02-07 16:42:25 +13:00
Damian Mooyman
a892272cc5 Shift public resources into public folder (#220) 2018-01-12 16:28:15 +13:00
Damian Mooyman
c9787b772d
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
#	.cow.json
#	composer.json
2017-11-16 10:47:38 +13:00
Daniel Hensby
ee92941f87
DOCS update comments for supported versions 2017-11-07 12:58:43 +00:00
Damian Mooyman
35a17cc9c0
Update recipe-plugin to 1.0 2017-10-25 11:14:32 +13:00
Damian Mooyman
46ca9bf59d
Update 4.1 dependencies 2017-10-12 10:17:25 +13:00
Damian Mooyman
d6c07093ce
Update branch alias 2017-10-12 10:16:42 +13:00
Damian Mooyman
ed0e2297a4 Remove obsolete branch-alias 2017-10-11 17:31:50 +13:00
Damian Mooyman
64211f1b1d
Move files to recipe-core 2017-10-10 15:41:25 +13:00
Damian Mooyman
980bf834b7 Fix recipe plugin version constraint 2017-07-25 11:13:55 +12:00
Damian Mooyman
2d04b844b7
API Convert installer to recipe 2017-07-24 14:45:14 +12:00
Christopher Joe
adca3aea68 Update composer alias 2017-07-06 09:03:09 +12:00
Damian Mooyman
7b68ac77ab Remove obsolete branch-alias 2017-07-03 16:53:55 +12:00
Jono Menz
4f68a04730 Added errorpage module 2017-06-15 16:02:13 -07:00
Damian Mooyman
41c2f8c82e Add campaign admin module 2017-03-28 13:32:45 +13:00
Damian Mooyman
3a1b9a82f5 Add versioned module 2017-03-28 10:35:25 +13:00
Daniel Hensby
d2c8e3c65f
Update PHP min version and PHPUnit version 2017-03-25 00:20:44 +13:00
Damian Mooyman
33087bcc8d Add assets as module 2017-03-23 09:24:14 +13:00
Damian Mooyman
61e5b3836e
Fix dev dependencies for root project 2017-03-16 16:01:15 +13:00
Damian Mooyman
94f3c609b2
Add admin module to root installer 2017-03-10 15:17:14 +13:00
Ingo Schommer
a8572e7b22 Added GraphQL dependency
This is required here in order for the "cow" release tool
to include the module in tagging releases.

At the moment, it's only an indirect asset-admin dependency,
but will become a framework dependency once we switch
CampaignAdmin to use GraphQL as well.
2017-01-17 11:44:33 +13:00
Damian Mooyman
a7ec54cb25 Remove self.version (#138)
Lock dev branches to dev
2016-09-20 10:20:52 +12:00
Robbie Averill
a6f1fa3b91 FIX use 1.0.x-dev for asset-admin composer contraint
* Resolves #131
2016-09-01 08:03:27 +12:00
Martijn van Nieuwenhoven
3687ef8cb3 update required php version
as in framework and cms
2016-05-13 00:01:34 +02:00
Damian Mooyman
639092d333 Merge 3.1 into master
# Conflicts:
#	composer.json
2016-05-11 17:54:40 +12:00
Sam Minnee
70be958cee Revert "Require php-tidy for dev dependencies (#87)"
This reverts commit bb24a9192e.

Fixes https://github.com/silverstripe/silverstripe-installer/issues/120
2016-05-11 17:35:51 +12:00
Damian Mooyman
1a5652d81c Merge 3 into master
# Conflicts:
#	composer.json
2016-05-11 14:33:39 +12:00
Damian Mooyman
4920218155 Merge 3.3 into 3 2016-05-11 14:02:09 +12:00
Damian Mooyman
0a3570808a Merge 3.2 into 3.3 2016-05-11 13:59:52 +12:00
Damian Mooyman
4ba8fda822 Merge 3.1 into 3.2
# Conflicts:
#	composer.json
2016-05-11 13:55:23 +12:00
Daniel Hensby
bb24a9192e Require php-tidy for dev dependencies (#87) 2016-05-08 22:05:19 +12:00
Damian Mooyman
8d2cc913e9 API Include asset-admin module in installer
Requires https://github.com/silverstripe/silverstripe-asset-admin/pull/132
2016-05-03 15:47:17 +12:00
Daniel Hensby
38fa596239 Bumping PHPUnit version 2016-01-25 15:09:58 +00:00
Damian Mooyman
c7327814b5 Alias 3 branch as 3.4 2015-12-23 14:25:24 +13:00
Daniel Hensby
eeec7be996 Merge branch '3' 2015-11-10 10:55:37 +00:00
Daniel Hensby
5e20faa72a Merge remote-tracking branch 'silverstripe/3.2' into 3
Conflicts:
	composer.json
2015-07-20 15:20:19 +01:00
Ingo Schommer
b5a1b91358 Merge remote-tracking branch 'origin/3' 2015-07-16 21:36:29 +12:00
Sam Minnee
ea72c5def0 Prefer stable packages while still allowing dev ones. Fixes #100
Although the original ticket recommended increasing our
minimum-stability, this change gives us the best of both worlds.

 - Where stable packages are available and meet the requirements, they
   will be used.
 - Where stable packages aren’t available or they don’t meet the
   dependency requirements, non-stable packages are still allowed.

As part of this I have also tightened up the silverstripe-themes req
version, as “*” is an anti-pattern. The versioning of the theme has
rightly split off from the versioning of the framework; it looks like
3.1.* is what we should expect.

Arguably, we could set the dependency to ~3.1, but in this case I think
it’s fine to be conservative.
2015-07-03 17:34:58 +01:00
David Alexander
dec0b889ad Updated minimum php version 2015-06-25 12:42:57 +12:00
Damian Mooyman
7b6f62968c Set reports and siteconfig version dependency 2015-06-18 11:41:59 +12:00
Damian Mooyman
750c02c15c Alias 3 as 3.3 2015-06-18 11:25:37 +12:00
Damian Mooyman
a9d4bef2a4 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	composer.json
2015-06-02 20:22:11 +12:00
Christopher Pitt
f04263d5da Added phpunit to dev dependencies 2015-02-26 14:29:38 +13:00
Christopher Pitt
5d5e614b38 Added phpunit to dev dependencies 2015-02-26 14:21:47 +13:00
Damian Mooyman
133e9d0332 Fix alias for 3.2 2014-11-20 17:24:51 +13:00
Damian Mooyman
46fb50b4be Update branch alias for master 2014-11-20 17:19:24 +13:00
Damian Mooyman
d1a090610e Update branch alias for 3 2014-11-20 17:19:04 +13:00
Sean Harvey
24892c6b66 Merge branch '3.1' 2013-07-30 14:43:37 +12:00
Sean Harvey
8be1dea481 Fixing regression in composer post scripts
Fixes regression on Windows where composer update and composer install because the path is hardcoded to only work on *nix systems.
2013-07-26 18:58:07 +12:00
Ingo Schommer
26ec73fde8 Fixed composer.json (merge error) 2013-06-02 20:38:13 +02:00
Ingo Schommer
6b8192e7bd Merge remote-tracking branch 'origin/3.1'
Conflicts:
	composer.json
2013-05-31 18:10:15 +02:00
Sam Minnee
26147bb962 NEW: Added post-install and post-update dev/build call.
With this change, composer will automatically call dev/build after an update or install
command.  The main reason that this is 3.1-only is that previous releases would have
necessitated the use of 'sudo -u www-data', which is too environment-specific.

One thing that this may cause problems with is 'composer create-project' in an environment
without a _ss_environment file.  It will call dev/build, and dev/build will throw an
error.  That should be fixed in a subsequent commit.
2013-05-30 16:23:35 +12:00
Sam Minnee
bf81f0394a FIX: Put self.version in composer dependencies.
Now that https://github.com/composer/composer/pull/1883 is in Composer, self.version
will work as a requirement for framework & cms.  This will simplify the release
process a great deal.

Ultimately, the release of rc1 will be the place to test that, but it seems appropriate
to get this in there for that.

If it succeeds with 3.1-rc1, I'd suggest we backport to 3.0 and 2.4.
2013-05-13 21:07:57 +12:00
Ingo Schommer
b23c744f41 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-09 16:55:44 +02:00
Ingo Schommer
345a32ec3e Remove require-dev section, composer doesn't handle it well
Any "composer require <module>" call will first call
a "composer update". This *automatically* includes dev requirements,
without providing a way to turn off this behaviour.
A workaround would be "composer require --no-update <module> && composer update --no-dev <module>",
but that drastically reduces the usefulness of the command
for our target audience (moderately technical devs).

In the end, the small faction of devs needing the dev dependencies
also know how to install them on their own. And having a local phpunit
build actually gets in the way more than it helps in case you have
it installed through PEAR already (can get really weird when using the
PEAR provided "phpunit" binary, but the autoloader finds the composer managed classes).
2013-05-07 10:51:47 +02:00
Ingo Schommer
41761472b2 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	composer.json
2013-03-08 10:54:49 +01:00
Will Rossiter
3c88359698 Include a higher timeout value to avoid timeouts.
Checking out framework can often take longer than the default
(300 seconds). This gives a 10min limit to creating a new project.
2013-03-06 20:22:48 +13:00
Ingo Schommer
4e885dd297 Forcing stable flags for release 2013-02-20 01:44:23 +01:00
Ingo Schommer
494bfc7863 Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	build.xml
	composer.json
	install.php
	phpunit.xml.dist
2013-02-15 19:19:23 +01:00
Ingo Schommer
972af938f5 Updated composer.json 2012-12-11 18:01:38 +01:00
Ingo Schommer
40b536654e Updated composer.json 2012-12-11 18:00:47 +01:00
Ingo Schommer
694f3ff350 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	composer.json
2012-12-11 02:04:34 +01:00
Ingo Schommer
52590b9019 Removed @stable tags from release branch
Same as 3.0.x-dev, they're only relevant for tags,
not for branches.
2012-12-07 00:42:44 +01:00
Ingo Schommer
fbc03f1fe2 Removed @stable flags from composer.json (release tag only)
They used to require manual editing of the composer.json
file in order to do a proper dev checkout. In the end,
the choice between release tag and dev branch should
be handled by composer already via the --stability flag.
2012-12-07 00:31:42 +01:00
Ingo Schommer
7d6c43e821 Added 'buildtools' to dev requirements in composer 2012-12-07 00:29:57 +01:00
Ingo Schommer
9c254cd72b Added @stable markers to composer.json 2012-12-05 01:10:13 +01:00
Sam Minnee
c80265981e Relaxed composer version requirements so that stable releases can be created.
Note that once sapphire, cms, and framework actually provide a stable version, '@stable' should put onto the end of the relevant require clauses.
2012-12-04 11:17:55 +13:00
Ingo Schommer
35cb3e97cd Merge remote-tracking branch 'origin/3.0' 2012-11-27 11:57:11 +01:00
Hamish Friedlander
ba56e6cd99 Merge changes for 3.0.3 release into 3.0 2012-11-26 15:59:02 +13:00
Hamish Friedlander
fbaab96324 FIX Avoid using self.version in composer.json
When using create-project, self.version doesnt work - the checkout looses the reference to the version
Fix by explicity referencing the version instead
2012-11-26 11:48:06 +13:00
Ingo Schommer
8e074cdfee Added silverstripe/behat-extension to require-dev 2012-11-18 11:42:10 +01:00