Compare commits

..

921 Commits
2.4.5-rc1 ... 4

Author SHA1 Message Date
Guy Sartorelli
603ffc064b
Merge branch '4.13' into 4 2023-09-18 11:32:55 +12:00
Guy Sartorelli
9372698a6b
Merge pull request #361 from creative-commoners/pulls/4.13/exclude
MNT Fix exclude node
2023-09-07 17:16:32 +12:00
Steve Boyd
3887540da7 MNT Fix exclude node 2023-09-07 14:14:12 +12:00
Guy Sartorelli
635d8be6fc
Merge branch '4.13' into 4 2023-08-29 10:28:52 +12:00
Guy Sartorelli
036f173a38
MNT Run ORM tests in parallel to other tests (#356) 2023-08-07 11:57:39 +12:00
Guy Sartorelli
6b966add42
MNT Update development dependencies 2023-04-26 12:45:22 +12:00
Guy Sartorelli
3445801412
Merge branch '4.13' into 4 2023-04-26 12:45:22 +12:00
Guy Sartorelli
a8f62aab68
MNT Update development dependencies 2023-04-26 12:08:16 +12:00
Guy Sartorelli
7264db0e34
MNT Update release dependencies 2023-04-26 12:08:13 +12:00
Guy Sartorelli
b18c0372f2
MNT Update development dependencies 2023-03-29 12:37:21 +13:00
Guy Sartorelli
bd202820de
MNT Update release dependencies 2023-03-29 12:37:18 +13:00
Maxime Rainville
5ce684af70
Merge pull request #351 from creative-commoners/pulls/4/dispatch-ci
MNT Use gha-dispatch-ci
2023-03-23 12:07:25 +13:00
Steve Boyd
ea654c1c9e MNT Use gha-dispatch-ci 2023-03-21 14:10:08 +13:00
Guy Sartorelli
f2f7455177
MNT Update development dependencies 2023-03-10 16:31:44 +13:00
Guy Sartorelli
f38f39761e
MNT Update release dependencies 2023-03-10 16:31:40 +13:00
Guy Sartorelli
e9fcd38f52
MNT Update development dependencies 2023-03-10 12:21:28 +13:00
Steve Boyd
5e497fa85f Merge branch '4.12' into 4 2023-02-02 16:37:27 +13:00
Guy Sartorelli
1049f90978
Merge pull request #348 from creative-commoners/pulls/4.12/test-other-modules
MNT Test additional modules
2023-01-26 14:09:42 +13:00
Steve Boyd
44a3fdb0ea MNT Test additional modules 2023-01-26 10:20:05 +13:00
Steve Boyd
f10a0206af
MNT Update development dependencies (#346) 2022-12-21 13:11:39 +13:00
Guy Sartorelli
4886a740ad
Merge pull request #345 from creative-commoners/pulls/4.12/stabilise
DEP Stabilise requirements
2022-12-21 12:25:34 +13:00
Steve Boyd
ed70400f9c DEP Stabilise requirements 2022-12-21 11:09:10 +13:00
Guy Sartorelli
0d52cbc913
Merge pull request #344 from creative-commoners/pulls/4.12/frameworktest
FIX Move test requirements out of require-dev
2022-12-21 11:01:04 +13:00
Steve Boyd
62c49cac6d FIX Move test requirements out of require-dev 2022-12-21 10:11:27 +13:00
Guy Sartorelli
ce944e8417
MNT Update development dependencies 2022-12-19 01:59:17 +00:00
Guy Sartorelli
58ada1c9ed
Merge branch '4.12' into 4 2022-12-19 01:59:17 +00:00
Guy Sartorelli
07e1b32a53
MNT Update development dependencies 2022-12-19 01:59:12 +00:00
Guy Sartorelli
0b89a51c0c
Merge branch '4.12-release' into 4.12 2022-12-19 14:55:52 +13:00
Guy Sartorelli
9c3ffd47c5
MNT Update release dependencies 2022-12-19 01:26:11 +00:00
Guy Sartorelli
fe1be1b8b7
MNT Update release dependencies 2022-11-30 03:27:41 +00:00
Guy Sartorelli
6a500ec454
Merge pull request #339 from creative-commoners/pulls/4.12/minor-xdev
MNT Update development dependencies
2022-11-28 12:47:28 +13:00
Steve Boyd
04f9beecf5 MNT Update development dependencies 2022-11-23 16:23:15 +13:00
Guy Sartorelli
7bc208e571
MNT Update development dependencies 2022-11-10 23:51:55 +00:00
Steve Boyd
4f62379f58 Merge branch '4.11' into 4 2022-08-02 18:47:06 +12:00
Steve Boyd
19c057efee Merge branch '4.10' into 4.11 2022-08-02 18:46:56 +12:00
Guy Sartorelli
8691390ad9
Merge pull request #329 from creative-commoners/pulls/4.10/standardise-modules
MNT Standardise modules
2022-08-02 14:29:06 +12:00
Steve Boyd
030e0d60fa MNT Standardise modules 2022-08-01 09:59:21 +12:00
Steve Boyd
a19303860f Merge branch '4.11' into 4 2022-07-25 11:30:18 +12:00
Steve Boyd
4d67d06700 Merge branch '4.10' into 4.11 2022-07-25 11:29:57 +12:00
Guy Sartorelli
56462207b6
Merge pull request #328 from creative-commoners/pulls/4.10/typo
MNT Fix typos
2022-07-22 14:19:00 +12:00
Steve Boyd
5b756664cc MNT Fix typos 2022-07-22 12:01:06 +12:00
Guy Sartorelli
4219d455d5
Merge pull request #326 from creative-commoners/pulls/4.10/module-standards
MNT Use GitHub Actions CI
2022-07-18 10:22:29 +12:00
Steve Boyd
a8d6ffdeab MNT Use GitHub Actions CI 2022-07-18 10:14:54 +12:00
Guy Sartorelli
4eea3f390a Merge branch '4.11' into 4 2022-06-14 11:33:28 +12:00
Maxime Rainville
45921d29de
Merge pull request #324 from creative-commoners/pulls/4.11/public-graphql-folder
ENH Add and ignore public/_graphql
2022-06-07 21:43:21 +12:00
Guy Sartorelli
57195eab03 ENH Add and ignore public/_graphql
silverstripe/graphql v4 needs write access to this directory, so it may
be easier for some developers to have the directory there as soon as
they `composer create_project silverstripe/installer`.

Like `.graphql-generated`, best practice is to not commit this directory
to VCS, and instead let it be filled at deploy time.
2022-06-02 10:33:36 +12:00
Maxime Rainville
7c06e8cbd1
Merge pull request #323 from creative-commoners/pulls/4.11/graphql-folder
ENH Add `.graphql-generated` directory by default
2022-06-01 21:11:26 +12:00
Guy Sartorelli
612ff2922b ENH Add .graphql-generated directory by default.
This directory will be required for all new projects (unless explicitly
opting out of graphql v4) - having this directory by default makes it
easier to set more sane permissions (i.e. not requiring the entire
project root to be writable).
2022-05-30 12:25:47 +12:00
Steve Boyd
3a5f852d31 Merge branch '4.11' into 4 2022-05-10 21:58:20 +12:00
Guy Sartorelli
db70cb692a
Merge pull request #322 from creative-commoners/pulls/4.11/devreq
DEP 4.11 dev requirements
2022-05-06 13:41:58 +12:00
Steve Boyd
8fe8bf5bec DEP 4.11 dev requirements 2022-05-05 12:18:08 +12:00
Guy Sartorelli
f19d383c68
Merge pull request #321 from creative-commoners/pulls/4/remove-pgsql
MNT Only use mysql in matrix
2022-05-03 09:55:28 +12:00
Steve Boyd
fea0ee4a96 MNT Only use mysql in matrix 2022-05-02 11:12:42 +12:00
Guy Sartorelli
7b08763477
Merge pull request #320 from creative-commoners/pull/4/no-allow-failure
MNT Do not allow failures on php 8.1
2022-04-28 16:50:22 +12:00
Steve Boyd
6e5f726df7 MNT Do not allow failures on php 8.1 2022-04-28 15:13:54 +12:00
Sabina Talipova
3ed95a2fc3
Merge pull request #319 from silverstripe/pulls/4/add-composer-installer-plugin
MNT Add composer/installers to allow-plugins by default.
2022-04-26 12:32:13 +12:00
Guy Sartorelli
bba20c5159
MNT Add composer/installers to allow-plugins by default. 2022-04-14 17:01:13 +12:00
Maxime Rainville
ce4615980c
MNT Ignore .graphql-generated in source control (#318) 2022-04-14 09:42:11 +12:00
Maxime Rainville
567236f2e8
Merge pull request #315 from creative-commoners/pulls/4/php74
DEP Set PHP 7.4 as the minimum version
2022-03-07 16:10:35 +13:00
Steve Boyd
d75e848a71 DEP Set PHP 7.4 as the minimum version 2022-02-21 09:51:35 +13:00
GuySartorelli
9a342a58ee
DOC Change "SilverStripe" to "Silverstripe" in readme (#314) 2022-02-02 10:15:45 +13:00
GuySartorelli
55f6e03f6e
ENH Explicitly allow SilverStripe composer plugins (#313)
As of Composer 2.2.0, there is a new configuration property to whitelist plugins which are allowed to run. According to https://getcomposer.org/doc/06-config.md#allow-plugins this will default to disallow all plugins from July 2022.
2022-01-21 10:13:00 +13:00
Steve Boyd
e1d2cd30e6 Merge branch '4.10' into 4 2021-12-22 10:25:41 +13:00
Maxime Rainville
345f091fd4
Merge pull request #312 from creative-commoners/pulls/4/410
DEP 4.10 requirements
2021-12-03 17:36:17 +13:00
Steve Boyd
0bc751ad90 DEP 4.10 requirements 2021-12-02 15:54:33 +13:00
Maxime Rainville
e48b1662a8
Merge pull request #310 from creative-commoners/pulls/4/sapphire-test-nine
API phpunit 9 support
2021-11-10 17:11:08 +13:00
Steve Boyd
54a8b8ce8f API phpunit 9 support 2021-11-04 11:13:45 +13:00
Maxime Rainville
081282cac1 MNT Target 4.x release 2021-09-03 11:53:14 +12:00
Maxime Rainville
2065c471ed MNT Targget 4.9.x release 2021-09-03 11:52:06 +12:00
Maxime Rainville
7ee712f47c
Merge pull request #309 from creative-commoners/pulls/4/cow-update
MNT supress changelog generation and loosen dependency constraint
2021-08-25 21:05:58 +12:00
Maxime Rainville
d1fcd1c061 MNT supress changelog generation and loosen dependency constraint 2021-08-25 18:12:01 +12:00
Maxime Rainville
e93ef98999
Merge pull request #308 from creative-commoners/pulls/4/sendmail
ENH Use Swift_SendmailTransport for new projects
2021-08-20 13:08:16 +12:00
Steve Boyd
be9d875141 ENH Use Swift_SendmailTransport for new projects 2021-08-19 09:57:24 +12:00
Daniel Hensby
ab68119de6
Merge pull request #306 from s-en-o/patch-1
Fix typo
2021-06-21 15:43:17 +01:00
Seno
9487628f7a
Fix typo 2021-06-21 20:58:29 +12:00
Steve Boyd
26e55e5226 Merge branch '4.8' into 4 2021-05-21 13:45:50 +12:00
Steve Boyd
6bb9c73137
Merge pull request #303 from creative-commoners/pulls/4.8/update-composer-dep
MNT Update composer dep for 4.8 release
2021-05-04 16:53:04 +12:00
Maxime Rainville
c90a8d3729 MNT Update composer dep for 4.8 release 2021-05-04 16:35:51 +12:00
Bryn Whyman
221b39bb27
Merge pull request #302 from creative-commoners/pulls/4/login-forms-changelog
ENH Add login-forms to changelog template
2021-04-30 12:10:53 +12:00
Steve Boyd
4e1fa260ee ENH Add login-forms to changelog template 2021-04-30 12:06:27 +12:00
Andre Kiste
69df70b045
Merge pull request #301 from creative-commoners/pulls/4/behat-framework
MNT Use admin behat suite instead of framework
2021-04-27 17:35:35 +12:00
Andre Kiste
4e47962d23
Merge pull request #299 from creative-commoners/pulls/4/multitab-frameworktest
MNT Bump frameworktest
2021-04-27 17:35:28 +12:00
Steve Boyd
5811293a74 MNT Use admin behat suite instead of framework 2021-04-27 12:44:46 +12:00
Steve Boyd
6961632875 MNT Bump frameworktest 2021-04-27 12:36:01 +12:00
Andre Kiste
37f30ca54e
Merge pull request #297 from creative-commoners/pulls/4/vfsstream
MNT Install vfsstream on travis
2021-04-27 12:12:15 +12:00
Steve Boyd
643a3bded3 MNT Install vfsstream on travis 2021-04-23 10:15:48 +12:00
Steve Boyd
821589a018 Merge branch '4.7' into 4 2021-01-28 12:37:14 +13:00
Steve Boyd
0ff05595bb
MNT Use frameworktest 0.3.0 for graphql 4 compatibility (#295) 2021-01-28 12:36:24 +13:00
Steve Boyd
9e637f7e07 Merge branch '4.7' into 4 2021-01-27 16:40:03 +13:00
Garion Herman
870ba6f55d
Merge pull request #294 from creative-commoners/pull/4.7/php8
MNT Update PHP8
2021-01-27 16:10:16 +13:00
Steve Boyd
3e2629a602 MNT Update PHP8 2021-01-27 11:25:31 +13:00
Steve Boyd
da876a829c
Update build status badge 2021-01-21 16:31:53 +13:00
Steve Boyd
d48994d993 Merge branch '4.7' into 4 2021-01-02 19:40:05 +13:00
Andre Kiste
b594a257ca
Merge pull request #293 from creative-commoners/pulls/4.7/travis-shared
MNT Travis shared config
2020-12-21 14:59:00 +13:00
Steve Boyd
7be811a914 MNT Travis shared config 2020-12-15 13:57:29 +13:00
Serge Latyntsev
523372bc15
Merge pull request #292 from creative-commoners/pulls/4.7/fix-deps
MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3
2020-11-11 12:21:23 +13:00
Serge Latyntcev
44728e4d9b MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3 2020-11-11 12:06:43 +13:00
Serge Latyntsev
495b9442d5
Merge pull request #290 from creative-commoners/pulls/4/php-8-builds
MNT Add PHP 8 builds
2020-10-23 11:21:40 +13:00
Garion Herman
f955099b6e MNT Add quotes to Behat config for Symfony 4 compat 2020-10-16 10:02:39 +13:00
Garion Herman
25332311ea MNT Add $COMPOSER_ARG to dependency installation 2020-10-16 10:02:12 +13:00
Garion Herman
4ea1f7082b MNT Add PHP 8 builds 2020-10-14 14:31:51 +13:00
Serge Latyntsev
0a57853c60
Merge pull request #289 from creative-commoners/pulls/4/use-changelog-template
MNT Tweak changelog template, ensure it is used by Cow
2020-10-13 13:18:18 +13:00
Garion Herman
4ddf1a901e MNT Tweak changelog template, ensure it is used by Cow 2020-10-09 15:28:58 +13:00
Steve Boyd
1b561f8d80
Update .travis.yml 2020-10-08 10:03:28 +13:00
Manuel Thalmann
6035ccd689
FIX Add redirects to public/ for iis (#263)
FIX Add redirects to `public/` for iis
2020-09-22 09:31:34 +12:00
Steve Boyd
65b2a72843 Merge branch '4.6' into 4 2020-09-11 09:59:09 +12:00
Steve Boyd
ae68dc4299
Merge pull request #286 from creative-commoners/changelog-template
DOCS more information in changelog template
2020-09-11 09:56:20 +12:00
Robbie Averill
1ac80f05a8
Merge pull request #288 from open-sausages/pulls/4/ignow-dot-cow-folder-on-builds
BUG Don't include the .cow folders in releases
2020-09-10 09:24:24 -07:00
Maxime Rainville
80d1bdf621 BUG Don't include the .cow folders in releases 2020-09-10 20:23:58 +12:00
brynwhyman
d76bd7d66e DOCS more information in changelog template
I've taken reference from the 4.6.1 change log to use the 'CMS Recipe' table. The other information is taken from the exisitng CWP change log template, see: https://github.com/silverstripe/cwp-recipe-kitchen-sink/blob/2/.changelog.md.twig
2020-09-10 16:50:43 +12:00
Garion Herman
daa0bf08ae
Merge pull request #271 from mandrew/patch-2
Set environment type in example
2020-07-27 10:36:02 +12:00
Michael Andrewartha
be7e4c8730 Set environment type in example
When running a dev/build for the first time, environment should be set to 'dev' or it won't run. 
Setting this in the example gives guidance to someone building a site for the first time (or if it's been ages!)
2020-07-27 10:34:36 +12:00
Steve Boyd
fb77893766
Merge pull request #278 from open-sausages/pulls/4/make-login-forms-core-module
BUG Treat login-forms as a core module
2020-07-02 15:48:31 +12:00
Maxime Rainville
27231bf315 BUG Treat login-forms as a core module 2020-06-30 22:14:55 +12:00
Robbie Averill
074c9dc45c Merge branch '4.6' into 4
# Conflicts:
 #	.travis.yml
2020-06-23 09:52:47 -07:00
Robbie Averill
63830aec7f
Merge pull request #285 from creative-commoners/pulls/4.6/travis
Update travis 4.6
2020-06-23 09:49:30 -07:00
Steve Boyd
5877d0ecce Update travis 2020-06-23 17:16:31 +12:00
Andre Kiste
9f2a17337a
Merge pull request #283 from creative-commoners/pulls/4/add-frameworktest
Require frameworktest
2020-06-16 14:48:25 +12:00
Steve Boyd
ffd0a85bd3 Require frameworktest 2020-06-16 12:42:59 +12:00
Maxime Rainville
d6bcc27fb5
Prep installer 4.6 branch. (#279)
API Bump requirements for recipe-cms to 4.6.x, require frameworktest for asset-admin behat test
2020-05-28 17:11:08 +12:00
Garion Herman
46f687ab5a Merge branch '4.5' into 4 2020-03-03 15:20:24 +13:00
Robbie Averill
3f9e2618c2
Merge pull request #275 from creative-commoners/pulls/4.5/php-7.4-builds
Update Travis config to include PHP 7.4 builds
2020-02-26 16:15:14 +11:00
Garion Herman
6851935652 Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat 2020-02-26 16:45:52 +13:00
Garion Herman
02ca9d772a Update Travis config to include PHP 7.4 builds 2020-02-26 14:58:21 +13:00
Steve Boyd
6bb01369f5
Merge pull request #270 from creative-commoners/pulls/4.5/remove-source-link-from-readme
DOC Update README with valid links to documentation
2020-02-03 17:01:23 +13:00
Steve Boyd
c921509259
Merge pull request #272 from creative-commoners/pulls/4.5/rc-changelog-message
DOC Adjust changelog template for RC releases
2020-01-16 13:29:23 +13:00
Garion Herman
966f7343d5 DOC Adjust changelog template for RC releases 2020-01-15 11:44:26 +13:00
Garion Herman
e5840dfbeb DOC Update README with valid links to documentation 2020-01-06 10:46:35 +13:00
Robbie Averill
03cab91539
Merge pull request #257 from open-sausages/pulls/4/login-forms
NEW Add silverstripe/login-forms
2019-12-10 19:52:31 -08:00
Ingo Schommer
87ae55539e
Merge branch '4' into pulls/4/login-forms 2019-12-11 15:46:06 +13:00
Andre Kiste
8f62bb9488
Merge pull request #267 from creative-commoners/pulls/4/rfc-9344
RFC-9344 Remove branch aliases
2019-12-10 13:38:53 +13:00
Serge Latyntcev
a3bc3d80c5 RFC-9344 Remove branch aliases 2019-12-09 10:58:15 +13:00
Robbie Averill
54265626f1
Merge pull request #266 from creative-commoners/recover/4
Update branch aliases
2019-11-28 16:50:18 -08: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
Serge Latyntcev
56b9c16880 Merge branch '4.4' into 4 2019-11-13 15:50:30 +13:00
Serge Latyntcev
93f8699b65 Merge branch '4.3' into 4.4 2019-11-13 15:49:40 +13:00
Garion Herman
b171632ccd
Merge pull request #254 from creative-commoners/pulls/4.4/release-changelog-template
Add and configure Cow changelog template
2019-10-22 13:00:41 +13:00
Garion Herman
626d7c9f99
FIX Update changelog template location config 2019-10-22 11:54:04 +13:00
Ingo Schommer
d01cf63018
Merge pull request #260 from open-sausages/pulls/4.3/remove-archive
Remove cow archive metadata
2019-09-24 10:41:54 +12:00
Ingo Schommer
03c2c996c5 Remove cow archive metadata
See https://github.com/silverstripe/silverstripe-framework/issues/9232
2019-09-20 11:35:43 +12:00
Robbie Averill
0ae3823eeb
Merge pull request #259 from nfauchelle/patch-1
Update the default location for tests in a project
2019-08-25 18:38:24 +12:00
Nick
7de2991fa3
Update the default location for tests in a project
Change the path since mysite isn't used anymore, new sites have an app folder instead.
2019-08-25 12:32:26 +12:00
Robbie Averill
70580acb2b
Merge pull request #258 from open-sausages/pulls/4/xenial
Enhancement / Update travis config to use Xenial
2019-07-26 09:40:10 +02:00
Serge Latyntcev
be4ff49c12 Enhancement / Update travis config to use Xenial 2019-07-26 12:56:40 +12: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
Garion Herman
e4acec30c8 Shift changelog template into dedicated cow config folder 2019-06-13 12:28:50 +12:00
Robbie Averill
d4af206393
Merge pull request #256 from sminnee/deprecate-pdo
NEW: Change .env.example to default to MySQL native driver
2019-06-13 11:15:18 +12:00
Sam Minnee
a968e7ad47 NEW: Change .env.example to default to MySQL native driver
https://github.com/silverstripe/silverstripe-framework/issues/8598
2019-06-11 16:19:50 +12:00
Ingo Schommer
09a2f6e298
Merge pull request #255 from creative-commoners/pulls/4.5/php71
API Bump minimum PHP version to 7.1
2019-06-07 14:39:36 +12:00
Robbie Averill
002cb6b61d API Bump minimum PHP version to 7.1 2019-05-23 13:59:31 +12:00
Garion Herman
0eede14f45 Add and configure Cow changelog template 2019-05-13 15:01:48 +12:00
Maxime Rainville
43b8000fd6 NEW Disable legacy resolution for new projects (#253) 2019-05-10 09:55:36 +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
c9a4efe29d Merge branch '4.3' into 4.4 2019-04-21 10:32:21 +12:00
Robbie Averill
d0521e1664 Merge branch '4.2' into 4.3 2019-04-21 10:32:11 +12:00
Robbie Averill
e650c43da7 Merge branch '4.1' into 4.2 2019-04-21 10:30:58 +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
Robbie Averill
1b31ffa28a Revert "Update development dependencies"
This reverts commit 1a55336552.
2019-02-19 05:25:35 +07:00
Aaron Carlino
1a55336552 Update development dependencies 2019-02-19 10:53:35 +13:00
Ingo Schommer
6e42093c9d
Merge pull request #250 from creative-commoners/pulls/4.1/split-framework-tests
Split framework tests from assets and versioned to prevent time limits being exceeded
2019-02-04 09:04:54 +13:00
Robbie Averill
c8451b9071 Split framework tests from assets and versioned to prevent time limits being exceeded
Also removed an unneeded editorconfig block which is duplicated and adds PHP 7.2 and 7.3 into the builds
2019-02-02 12:15:17 +03:00
Robbie Averill
a9e1e328ca
Merge pull request #248 from open-sausages/pulls/4.2/fix-tests
TravisCI / fix silverstripe/posgresql version
2019-02-01 09:19:02 +02:00
Serge Latyntcev
e279f35abf TravisCI / fix silverstripe/posgresql version 2019-02-01 16:05:37 +13:00
Robbie Averill
e8614b59bb
Bump postgres version in Travis builds to match silverstripe/framework@4.4 2019-01-31 11:43:39 +02:00
Serge Latyntcev
9fe50bb42b Merge branch '4.3' into 4 2019-01-28 14:14:23 +13:00
Serge Latyntcev
2473e05496 Merge branch '4.2' into 4.3 2019-01-28 14:09:54 +13:00
Serge Latyntcev
127c62a0c9 Merge branch '4.1' into 4.2 2019-01-28 14:09:19 +13:00
Serge Latyntsev
824bd2cf91
Merge pull request #244 from open-sausages/pulls/4.1/behat-install
FIX / Installer tests
2019-01-28 12:11:58 +13:00
Maxime Rainville
0f02f2364f MINOR Make installer default to using _resources (#242) 2019-01-16 21:34:13 +13:00
Maxime Rainville
f04beea2f3
Merge pull request #246 from Firesphere/patch-1
Add Roave Security advisories to composer
2019-01-08 10:07:45 +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
Serge Latyntcev
3d841a409c FIX / Behat tests
Most of the modules stop exporting metadata files (behat.yml among those) to packagist
Thus when travis runs behat tests it cannot find configuration for the test suites
2018-12-18 16:38:40 +13:00
Robbie Averill
b66e851dda Merge branch '4.3' into 4 2018-11-21 09:12:30 +01:00
Robbie Averill
3abeb18858 Merge branch '4.2' into 4.3
# Conflicts:
 #	composer.json
2018-11-21 09:12:10 +01:00
Robbie Averill
84aaa17461 Merge branch '4.1' into 4.2 2018-11-21 09:11:20 +01:00
Robbie Averill
d0890776e8 Merge branch '4.0' into 4.1 2018-11-21 09:11:04 +01:00
Robbie Averill
fcd4052a07
Update Slack integration token 2018-11-21 09:10:41 +01:00
Robbie Averill
90f54ccfe9
Merge pull request #240 from JorisDebonnet/patch-4
Correct typo
2018-10-17 21:56:44 +02:00
JorisDebonnet
fa3c87f61e
Correct typo 2018-10-17 18:05:20 +02: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
Robbie Averill
caf0bc12f7 Merge branch '4.3' into 4 2018-10-15 14:43:00 +02:00
Aaron Carlino
c24d4c73c3 Remove obsolete branch-alias 2018-10-15 16:31:48 +13:00
Dan Hensby
986a2f951a
Update composer.json version constraint 2018-08-04 08:59:12 +02:00
Daniel Hensby
eba91f9bec
Merge branch '4.2' into 4
# Conflicts:
#	composer.json
2018-07-30 17:14:31 +01:00
Daniel Hensby
539b58d7aa
Merge tag '4.2.1' into 4.2
Release 4.2.1
2018-07-30 17:12:06 +01:00
root
0307496292 Update development dependencies 2018-07-30 15:23:32 +00:00
Daniel Hensby
15f8011493
Merge branch '4.2' into 4
# Conflicts:
#	composer.json
2018-07-30 11:23:08 +01:00
Daniel Hensby
6ad3a067c3
Merge tag '4.2.0' into 4.2
Release 4.2.0
2018-07-30 11:14:13 +01:00
root
b1cd5afe28 Update development dependencies 2018-07-24 19:22:22 +00:00
Daniel Hensby
7d838b0631
Update composer dep 2018-07-24 16:47:35 +01:00
Robbie Averill
baf63747b4
Bump Postgres version to 2.1.x-dev for SilverStripe 4.2+ 2018-06-29 16:39:17 +12:00
Robbie Averill
28da082fa1
Merge pull request #232 from open-sausages/pulls/4.3/increment-travis-version-to4.3.x-dev
Increment travis root version to 4.3.x-dev
2018-06-29 16:38:38 +12:00
Maxime Rainville
1431370940 Increment travis root version to 4.3.x-dev 2018-06-26 17:49:01 +12: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
0d5daf5658 Update development dependencies 2018-06-15 15:52:39 +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
Damian Mooyman
d178ebdb9e
Merge pull request #230 from creative-commoners/pulls/4/remove-classmap
FIX Remove incorrect classmap for Page and PageController
2018-06-05 12:08:10 +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
Robbie Averill
9a407320ed Merge branch '4.1' into 4 2018-05-28 18:32:48 +12:00
Robbie Averill
dc4b512afb Merge remote-tracking branch 'origin/4.0' into 4.1
# Conflicts:
  #	.travis.yml
2018-05-28 17:57:27 +12:00
Robbie Averill
743f9c649e Merge remote-tracking branch 'origin/3.6' into 4.0
# Conflicts:
  #	.cow.json
  #	.gitignore
  #	composer.json
2018-05-28 17:54:29 +12:00
Robbie Averill
cd6a22c78f Merge branch 'heads/4.0.4' into 4.0 2018-05-28 17:47:06 +12:00
Robbie Averill
ec5093feb6
Merge pull request #3 from silverstripe-security/pulls/4.0/ss-2018-014
[SS-2018-014] Remove jar, css and js from file extension whitelist
2018-05-14 17:20:31 +12:00
Robbie Averill
be96858e85 [SS-2018-014] Remove jar, dotm, potm, xltm from file extension whitelist, hard-code CSS and JS for TinyMCE support 2018-05-14 17:20:03 +12:00
Robbie Averill
c6ff9b1245
Merge pull request #2 from silverstripe-security/pulls/4.0/ss-2018-012
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:36 +12:00
Damian Mooyman
f9c03fa623 [ss-2018-012] Prevent php code execution in assets folder 2018-05-14 17:18:12 +12:00
Robbie Averill
9d8193d19c
Merge pull request #225 from open-sausages/pulls/4.0/selenium-upgrade
Update selenium to chromedriver
2018-04-13 10:50:50 +12:00
Damian Mooyman
7cfaeccfb1
Remove empty psr-4 2018-04-13 10:15:04 +12:00
Damian Mooyman
d678bd76f9
Update selenium to chromedriver 2018-04-13 09:30:04 +12:00
Damian Mooyman
39f0af225f
Merge pull request #223 from open-sausages/pulls/4/appy-days
Shift resources into app folder
2018-04-11 15:25:06 +12:00
Damian Mooyman
b18d3752b6
Merge pull request #224 from aNickzz/patch-1
Update .gitignore
2018-04-11 10:44:24 +12:00
aNickzz
26f4ef722d
Update .gitignore
Update to match #213
2018-04-10 16:34:40 +09:30
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
b6730c5c9c
Update root composer version for 4.1 branch 2018-02-07 16:43:17 +13:00
Damian Mooyman
7fb7f885f9
Update branch alias 2018-02-07 16:42:25 +13:00
Damian Mooyman
b060892992
BUG Fix routing error for public assets
Port of https://github.com/silverstripe/recipe-core/pull/14 to installer
2018-02-07 13:57:17 +13:00
Damian Mooyman
81045f46c2 Update development dependencies 2018-02-05 17:15:37 +13:00
Damian Mooyman
a892272cc5 Shift public resources into public folder (#220) 2018-01-12 16:28:15 +13:00
Damian Mooyman
9ca6c3a89b
Merge pull request #219 from open-sausages/pulls/4.0/no-dev-should-be-needed-here
Enhancement add test for a `--no-dev` build
2018-01-08 13:44:37 +13:00
Christopher Joe
4d60f01d2d Enhancement add test for a --no-dev build 2017-12-22 15:27:43 +13:00
Christopher Joe
decd8bb446 Merge branch '4.0' of github.com:silverstripe/silverstripe-installer into 4 2017-12-21 13:40:09 +13:00
Damian Mooyman
bb1944f64d
Merge pull request #218 from open-sausages/pulls/4.0/its-a-travis-tee-with-behat
FIX travis OS build version so that behat will function
2017-12-21 12:02:27 +13:00
Christopher Joe
dd75e68f86 FIX travis OS build version so that behat will function 2017-12-20 21:40:27 +13:00
Damian Mooyman
1f67410858
Merge pull request #214 from open-sausages/pulls/4.1/composer-does-prefer-dist
Feature update composer with --prefer-source flag so that tests are included
2017-12-19 14:28:49 +13:00
Damian Mooyman
e06e3c4e83
Update travis.yml 2017-12-19 12:07:44 +13:00
Christopher Joe
ccece4bf1c Feature update composer with --prefer-source flag so that tests are included 2017-12-11 12:27:53 +13:00
Damian Mooyman
45b3cb6a43
Merge remote-tracking branch 'origin/3.5' into 3.6 2017-12-06 17:18:51 +13:00
Damian Mooyman
75984719db
Ignore modules 2017-12-06 16:22:20 +13:00
Damian Mooyman
68fdb0684e
Add .cow.json to 3.5 branch 2017-12-06 15:42:10 +13:00
Damian Mooyman
c30abae60c
Merge pull request #213 from aNickzz/patch-2
Ignore (almost) everything in the assets folder
2017-12-01 14:30:09 +13:00
aNickzz
2d90647410
Update .gitignore
Uploading files directly through the Files LeftAndMain drops them directly into the assets folder by default. This will help prevent those files accidentally ending up in git.
2017-11-30 22:03:34 +10:30
Damian Mooyman
0bf0f44403
Merge pull request #210 from dhensby/pulls/3.5/phpunit-loosen-constraint
Loosen PHPUnit constraints
2017-11-20 13:59:51 +13:00
Daniel Hensby
b1875ea1af
Loosen PHPUnit constraints 2017-11-17 11:37:41 +00: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
Damian Mooyman
19e8849eaf
Merge pull request #209 from martinduparc/patch-1
Update README.md
2017-11-10 15:53:08 +13:00
Damian Mooyman
d3fc0d4571
Merge pull request #208 from dhensby/pulls/4.0/this-is-ss4
DOCS update comments for supported versions
2017-11-10 15:52:12 +13:00
Martin D
76965d53aa
Update README.md
Fixed links
2017-11-07 10:21:33 -05:00
Daniel Hensby
ee92941f87
DOCS update comments for supported versions 2017-11-07 12:58:43 +00:00
Damian Mooyman
d6c528b8bc Fix test paths 2017-10-25 16:20:00 +13:00
Chris Joe
8dc64d17d0 Merge pull request #204 from open-sausages/pulls/4.0/update-plugin
Update recipe-plugin to 1.0
2017-10-25 11:21:34 +13: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
8fa7c9a27a Update test paths 2017-10-11 17:48:36 +13:00
Damian Mooyman
ed0e2297a4 Remove obsolete branch-alias 2017-10-11 17:31:50 +13:00
Chris Joe
33aa9ab719 Merge pull request #203 from open-sausages/pulls/4.0/better-beta4-upgrade
Move files to recipe-core
2017-10-10 16:59:22 +13:00
Damian Mooyman
64211f1b1d
Move files to recipe-core 2017-10-10 15:41:25 +13:00
Ingo Schommer
e32b1bbd07 Merge pull request #202 from open-sausages/pulls/4/request-uri
Use index.php for serving content
2017-10-09 10:41:39 +01:00
Ingo Schommer
c369cd2358 Move index.php to recipe-core
It needs to work with installer-less projects as well
2017-10-05 08:18:51 +01:00
Ingo Schommer
bce724ca76 Use index.php for serving content
Removes main.php reliance. Paves the way for
serving SilverStripe from a public/ subfolder in the base path.
This requires an index.php file in the webroot,
since you can't set a RewriteRule to a path outside of the webroot
(e.g. "public/.htaccess" pointing to "../vendor/silverstripe/framework/main.php").
2017-10-05 08:09:45 +01:00
Damian Mooyman
edf6f4c1d3 Merge pull request #201 from open-sausages/pulls/4/gitignore
Update gitignore for vendor module move
2017-10-05 09:00:31 +13:00
Ingo Schommer
ec36574665 Update gitignore for vendor module move
See https://github.com/silverstripe/silverstripe-framework/issues/7405s
2017-10-04 09:54:57 +01:00
Damian Mooyman
67ed44823e Merge pull request #200 from open-sausages/pulls/4/vendorise-me-baby
Support custom main.php location
2017-10-03 16:11:06 +13:00
Damian Mooyman
8ab058a3fd
Update unit test paths and asset .htaccess 2017-10-03 15:09:02 +13:00
Ingo Schommer
96045afc65 Adjust phpunit path to framework 2017-10-03 05:09:43 +13:00
Ingo Schommer
7de2e07139 Fix main.php path in install.php 2017-10-03 03:19:23 +13:00
Ingo Schommer
2d53abd2c2 Removed stylesheet from frameworkmissing file
If the framework is missing, there's no point referencing a stylesheet from it...
2017-10-03 03:18:51 +13:00
Ingo Schommer
e88f7654da Fix main.php path 2017-10-03 03:18:51 +13:00
Ingo Schommer
f22d9b3735 Fix main.php path 2017-10-03 01:44:14 +13:00
Ingo Schommer
a1384f67b7 Simplify serving static assets in index.php
No need to perform custom file reading.
See https://github.com/laravel/laravel/blob/master/server.php#L18
and http://php.net/manual/en/features.commandline.webserver.php
2017-10-03 01:44:06 +13:00
Chris Joe
41b87ab2d5 Merge pull request #198 from open-sausages/pulls/4.0/adjust-timeout
Adjust behat timeout for asset-admin tests
2017-09-29 12:03:02 +13:00
Damian Mooyman
0cf5924277
Update .travis.yml 2017-09-29 10:03:30 +13:00
Damian Mooyman
2c81adf3e6 Adjust behat timeout for asset-admin tests 2017-09-29 09:45:55 +13:00
Chris Joe
9e6114c151 Merge pull request #195 from sminnee/gimme-more-files
FIX: Include .env.example and .editorconfig in git export
2017-09-06 15:24:55 +12:00
Chris Joe
40c6fcf18f Merge pull request #197 from open-sausages/pulls/4.0/recipe-info
Provide information related to recipe
2017-08-14 23:05:50 +12:00
Saophalkun Ponlu
26cd654dbb Provide information related to recipe 2017-08-14 17:15:42 +12:00
Damian Mooyman
4df28ad121
Added archive config 2017-08-04 16:39:39 +12:00
Sam Minnee
424b1c04dd FIX: Include .env.example and .editorconfig in git export
The “export” downloads of the installer should include these two files
as they are of use to regular developers.

 * .editorconfig encourages the use of our standard code format
 * .env.example is a helper for new developers
2017-07-31 17:36:33 +12:00
Damian Mooyman
980bf834b7 Fix recipe plugin version constraint 2017-07-25 11:13:55 +12:00
Chris Joe
dd2ebad5dc Merge pull request #193 from open-sausages/pulls/4.0/recipe-concept
API Convert installer to recipe
2017-07-24 15:13:35 +12:00
Damian Mooyman
2d04b844b7
API Convert installer to recipe 2017-07-24 14:45:14 +12:00
Damian Mooyman
d3de9e075f Merge pull request #191 from nfauchelle/patch-1
Update .gitignore
2017-07-07 22:05:01 +12:00
Nick
afb523424e Update .gitignore
Add in another module which is managed by composer
2017-07-07 21:02:29 +12:00
Damian Mooyman
f9bc5a3fc0 Merge pull request #190 from robbieaverill/patch-1
Add editorconfig rule for composer.json to be allowed four spaces
2017-07-06 14:46:24 +12:00
Robbie Averill
5284ca65b0 Add editorconfig rule for composer.json to be allowed four spaces 2017-07-06 12:41:02 +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
Daniel Hensby
1e7d9f9a15 Merge pull request #185 from robbieaverill/patch-1
FIX Delete Page_Controller from SS4 compat branch
2017-06-27 23:38:47 +01:00
Robbie Averill
b8750d9399 FIX Delete Page_Controller from SS4 compat branch
I assume this turned up in a merge-up - having this around breaks breaks things. Should be PageController now.
2017-06-28 10:05:38 +12:00
Daniel Hensby
69441aba44
Merge branch '3' 2017-06-27 13:27:40 +01:00
Daniel Hensby
61bf3af041
Merge branch '3.6' into 3 2017-06-27 13:10:11 +01:00
Daniel Hensby
6eadd1e6a4
Merge tag '3.6.1' into 3.6
Release 3.6.1
2017-06-27 12:56:12 +01:00
Damian Mooyman
c9c9cf7d58 Merge pull request #182 from jonom/master
Added errorpage module requirement
2017-06-27 14:30:48 +12:00
Ingo Schommer
333d3a5408 Merge pull request #183 from open-sausages/pulls/4.0/app-object
Remove unneeded globals
2017-06-22 22:58:14 +12:00
Damian Mooyman
a74e513a29
Remove unneeded globals 2017-06-20 17:20:00 +12:00
Jono Menz
4f68a04730 Added errorpage module 2017-06-15 16:02:13 -07:00
Daniel Hensby
b2db7dc990 Merge pull request #1 from silverstripe-security/patch/3.6.0/SS-2017-017
[SS-2017-017] FIX SVG uploads disabled by default
2017-06-14 14:43:37 +01:00
Chris Joe
5aa694953e Merge pull request #180 from open-sausages/pulls/4.0/remove-dummy
Remove redundant dummy file in assets
2017-06-08 10:49:28 +12:00
Damian Mooyman
bf76193e13
Remove redundant dummy file in assets 2017-06-06 11:45:15 +12:00
Daniel Hensby
d0de968167
Merge branch '3.6' into 3 2017-05-30 23:50:37 +01:00
Daniel Hensby
f589adb0b9
Merge branch '3.5' into 3.6 2017-05-30 23:49:40 +01:00
Daniel Hensby
ed34be06c1
Merge tag '3.6.0' into 3.6
Release 3.6.0
2017-05-30 23:49:34 +01:00
Daniel Hensby
1aac471131
Merge branch '3.4' into 3.5 2017-05-30 23:48:39 +01:00
Daniel Hensby
f7cb994ab6
Merge tag '3.5.4' into 3.5
Release 3.5.4
2017-05-30 23:48:37 +01:00
Daniel Hensby
d07a18a643
Merge tag '3.4.6' into 3.4
Release 3.4.6
2017-05-30 23:47:06 +01:00
Daniel Hensby
a32988fc04
Merge remote-tracking branch 'security/3.5.4' into 3.6.0 2017-05-29 01:29:55 +01:00
Daniel Hensby
6475ac9e7d
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:03:15 +01:00
Daniel Hensby
a063c1caec
Merge pull request #174 from robbieaverill/phpcs-standard-3.x
Add PHPCS standard for SS 3.x
2017-05-28 21:37:39 +00:00
Daniel Hensby
c25478bef7
[SS-2017-017] FIX SVG uploads disabled by default 2017-05-25 13:18:13 +01:00
Chris Joe
0e85f88204 Merge pull request #178 from open-sausages/pulls/4.0/add-behat-tests
API Add pgsql + behat tests to installer
2017-05-25 12:57:55 +12:00
Damian Mooyman
2e94a11c8b
API Add pgsql + behat tests to installer 2017-05-23 14:50:12 +12:00
Damian Mooyman
d406fa365f Merge pull request #179 from nfauchelle/ignore-modules-handled-by-composer
Add in the module folders which come from the default install
2017-05-22 21:17:05 +12:00
Nick
aa1c2ce05a Add in the module folders which come from the default SilverStripe composer.json. Since we ignore the /vendor/ folder we should ignore these items as well since composer will maintain them 2017-05-22 20:44:14 +12:00
Damian Mooyman
d9f28b2017 Merge pull request #177 from nfauchelle/psr-2-adjustments
Update the PHP files to PSR-2 spec
2017-05-15 09:15:09 +12:00
Nick
d3ed3f7476 Update the PHP files to PSR-2 spec 2017-05-14 21:48:27 +12:00
Damian Mooyman
f54ff29a02 API Remove BlockUntrustedIPs 2017-05-11 09:31:23 +12:00
Daniel Hensby
02e3e102c1
Merge branch '3.6' into 3 2017-05-08 16:20:04 +01:00
Daniel Hensby
9dfe62577b
Merge branch '3.5' into 3.6 2017-05-08 16:19:40 +01:00
Daniel Hensby
e35dd82f2d
Merge branch '3.4' into 3.5 2017-05-08 15:49:49 +01:00
Damian Mooyman
df40d5f8c6 Update for behat 3 2017-05-05 17:21:32 +12:00
Ingo Schommer
247878f03b Merge pull request #174 from robbieaverill/phpcs-standard-3.x
Add PHPCS standard for SS 3.x
2017-04-28 08:27:30 +12:00
Robbie Averill
9acd97791a Update code formatting for the SS3 PHPCS ruleset, separate Page_Controller to new file 2017-04-28 07:33:07 +12:00
Robbie Averill
451e7961d2 Add PHPCS configuration for SilverStripe 3.x
Based on PSR-2, allowing some exceptions like class and method naming rules and namespaces for every class
2017-04-28 07:28:40 +12:00
Daniel Hensby
8a3e352595
Aliasing 3 as 3.7.x-dev 2017-04-21 16:14:18 +01:00
Damian Mooyman
63186c87fe Merge pull request #162 from open-sausages/pulls/4.0/fix-release-constraints
Lock dependency-constraint prior to beta
2017-04-05 16:30:11 +12:00
Damian Mooyman
f9f61cbce2
BUG Fix cow release config 2017-04-05 16:11:19 +12:00
Chris Joe
d839245a73 Merge pull request #168 from open-sausages/pulls/4.0/combine-tests
Add combined test suite for installer
2017-04-05 15:16:50 +12:00
Damian Mooyman
f3d64abd55
Add combined test suite for installer
Remove teamcity config from default install
Partial implementation of #164
Fixes #166
2017-04-04 16:39:12 +12:00
Loz Calver
c2c184cbb9 Merge pull request #165 from dhensby/pulls/4/test-update
Update PHPUnit XML configs to remove SS TestListener
2017-03-30 10:42:27 +01:00
Daniel Hensby
57582636fa
Update PHPUnit XML configs to remove SS TestListener 2017-03-30 10:35:21 +01:00
Damian Mooyman
e6b713a323 Merge pull request #163 from sminnee/license-file
FIX: Split licence into separate file to match standard.
2017-03-29 17:35:08 +13:00
Sam Minnee
639631013f FIX: Split licence into separate file to match standard. 2017-03-29 12:45:25 +13:00
Ingo Schommer
345c225527 Merge pull request #160 from open-sausages/pulls/4.0/campaign-admin
Add campaign admin module
2017-03-28 17:51:04 +13: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
Damian Mooyman
2809247c24
Lock dependency-constraint prior to beta
Fixes https://github.com/silverstripe/silverstripe-framework/issues/6737
2017-03-27 10:00:41 +13:00
Loz Calver
2768e6ca6b Merge pull request #161 from dhensby/pulls/phpunit
Update PHP min version and PHPUnit version
2017-03-24 11:28:22 +00: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
Daniel Hensby
a8eda2ab05 Merge pull request #157 from open-sausages/pulls/4.0/fix-devs
Fix dev dependencies for root project
2017-03-16 16:42:33 +13:00
Daniel Hensby
0e7f29b5db Merge pull request #153 from Zauberfisch/patch-1
Block common log file names in .htaccess
2017-03-16 16:38:15 +13:00
Damian Mooyman
61e5b3836e
Fix dev dependencies for root project 2017-03-16 16:01:15 +13:00
Ingo Schommer
aacbae8107 Merge pull request #156 from open-sausages/pulls/4.0/admin-module
Add admin module to root installer
2017-03-15 12:02:20 +13:00
Damian Mooyman
94f3c609b2
Add admin module to root installer 2017-03-10 15:17:14 +13:00
Damian Mooyman
9da75efec8 Alias 3 as 3.6 2017-03-06 11:13:04 +13:00
Damian Mooyman
18a5348caa Merge pull request #110 from spekulatius/patch-1
tab -> space in editorconfig
2017-03-01 13:00:09 +13:00
Damian Mooyman
9c68dc0276 Merge pull request #155 from open-sausages/pulls/4.0/circular-deps
Fix remove the wildcard After condition in config.yml
2017-02-28 15:32:18 +13:00
Christopher Joe
ac685e4d38 Fix remove the wildcard After condition in config.yml 2017-02-28 15:30:46 +13:00
Zauberfisch
d7834c5ae7 Block common log file names in .htaccess 2017-02-19 11:10:21 +00:00
Daniel Hensby
5d778fa2a5 Merge pull request #152 from open-sausages/pulls/4.0/disable-trailing-slash-redirect
Disable trailing slash redirect for dirs
2017-02-02 10:10:47 +00:00
Ingo Schommer
63948d8064 Disable trailing slash redirect for dirs
If you're running mod_dir on Apache, and create a route which matches a directory name
(such as 'framework'), "GET /framework" will result in a 301 to "/framework/?url=framework".
While the SilverStripe routing might decide to enforce trailing slash rules later,
Apache shouldn't have any business here.

The specific bug this fixes was redirecting "/graphql" to "/graphql/",
with the silverstripe/graphql module installed.

See https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryslash
2017-02-02 21:03:09 +13:00
Loz Calver
c92cc50353 Merge pull request #150 from dhensby/pulls/4/dot-env-example
NEW Add .env.example file
2017-02-01 11:27:24 +00:00
Daniel Hensby
06b475896d
NEW Add .env support 2017-02-01 11:26:46 +00:00
Daniel Hensby
a4d886e9d4 Merge pull request #149 from colintucker/fix-controller-init-visibility
Changed init() visibility to protected
2017-01-23 16:38:11 +00:00
Colin Tucker
0cbee4b0c2 Changed init() visibility to protected 2017-01-22 09:34:57 +11:00
Damian Mooyman
322a94e2c4 Merge pull request #148 from open-sausages/pulls/graphql-dep
Added GraphQL dependency
2017-01-17 13:26:32 +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
Ingo Schommer
5e3e66916d Merge pull request #146 from robbieaverill/feature/controllers-without-underscores
API Change Page_Controller to PageController (PSR-2 compliance)
2017-01-12 08:52:11 +13:00
Robbie Averill
e9a4095c9a PSR-2 compliance: Move PageController class to its own file 2017-01-05 13:07:23 +13:00
Robbie Averill
fb06cc0075 API Change Page_Controller to PageController (PSR-2 compliance) 2017-01-05 13:03:18 +13:00
Damian Mooyman
51a9fdf5d1
BUG Fix test listener path 2016-11-02 11:13:46 +13:00
Damian Mooyman
9a24d8e437
Update installer for src folder 2016-11-01 15:35:26 +13:00
Daniel Hensby
70e85745fb Merge pull request #137 from tractorcow/pulls/4.0/cow-meta
[WIP] Add experimental release metadata to module
2016-10-12 01:11:01 +01:00
Damian Mooyman
41f865a79c
Add experimental release metadata to module 2016-10-12 10:04:25 +13:00
Daniel Hensby
fce041c5af Merge pull request #141 from JorisDebonnet/patch-3
Updated link to Requirements doc
2016-09-26 14:25:32 +01:00
JorisDebonnet
20740026da Updated link to Requirements doc 2016-09-26 15:10:33 +02:00
Damian Mooyman
4301fa850d BUG Fix incorrect backslash escaping in htaccess template (#140) 2016-09-22 18:01:44 +12:00
Damian Mooyman
a7ec54cb25 Remove self.version (#138)
Lock dev branches to dev
2016-09-20 10:20:52 +12:00
Damian Mooyman
98ad908532 Rename SS_ prefixed classes (#136) 2016-09-09 15:33:34 +12:00
Ingo Schommer
c9bf8bb016 Merge pull request #135 from open-sausages/pulls/4.0/namespace-everything
Upgrade installer
2016-09-08 16:15:56 +12:00
Daniel Hensby
73a519587f
Merge branch '3' 2016-09-08 00:27:46 +01:00
Damian Mooyman
3df2ddde13 Upgrade installer 2016-09-07 17:33:14 +12:00
Ingo Schommer
ba721842c5 Merge pull request #134 from open-sausages/pulls/4.0/remove-i18n-setlocale
Remove i18n::set_locale from default installer
2016-09-07 17:08:25 +12:00
Damian Mooyman
638abc5808
Remove i18n::set_locale from default installer 2016-09-07 16:57:11 +12:00
Daniel Hensby
ca725e6269 Merge pull request #132 from robbieaverill/bugfix/131-asset-admin-dev-master
FIX use latest dev-master for asset-admin composer contraint
2016-08-31 21:31:30 +01: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
Hamish Friedlander
d62ddadb91 Merge pull request #130 from open-sausages/pulls/4.0/namespace-cms
Update for CMS namespace
2016-08-11 08:10:05 +07:00
Damian Mooyman
a54cd1fa31 Merge 3.4 into 3
# Conflicts:
#	composer.json
2016-08-05 19:13:06 +12:00
Damian Mooyman
3fa6f04047 Update for CMS namespace 2016-08-04 14:41:44 +12:00
Damian Mooyman
f299c4d18d Remove obsolete alias 2016-07-28 14:32:15 +12:00
Damian Mooyman
93f4dd1764 API Support nested themes API (#129) 2016-07-25 17:26:22 +12:00
Stevie Mayhew
810b49b4a8 Merge pull request #127 from JorisDebonnet/patch-2
Update minimum php version in top comments in index.php and install.php
2016-06-04 10:27:27 +12:00
JorisDebonnet
da3ef94acf Update minimum php version in index.php and install.php comments 2016-06-03 21:52:33 +02:00
Stevie Mayhew
63a028d711 Merge pull request #125 from silverstripe/copyright-in-contributingmd
Make installer copyright note conform to others
2016-05-30 14:57:48 +12:00
Sam Minnée
171a543d73 Make installer copyright note conform to others
Make the notice here match those on other modules.

See https://github.com/silverstripe/silverstripe-framework/pull/5610
2016-05-30 14:36:08 +12:00
Damian Mooyman
675ee0a106 Alias 3 as 3.5 2016-05-19 16:09:34 +12:00
Damian Mooyman
ea4333fec6 Merge 3 into master 2016-05-18 17:30:22 +12:00
Hamish Friedlander
bede06a1aa Merge pull request #124 from open-sausages/pulls/3/http-default-code
API Enable friendly error HTTP code by default for new projects
2016-05-18 15:37:54 +12:00
Damian Mooyman
c55777c9af API Enable friendly error HTTP code by default for new projects 2016-05-18 15:17:43 +12:00
Daniel Hensby
00016f6378 Merge pull request #122 from axyr/update-php-version
update required php version
2016-05-14 11:20:46 +01:00
Sam Minnee
23cf0b8e8d Merge branch '3.3' into 3 2016-05-13 16:53:04 +12:00
Sam Minnee
9c42bb7b4d Merge remote-tracking branch 'origin/3.2' into 3.3 2016-05-13 16:50:35 +12:00
Sam Minnee
ff589cb4e3 Merge remote-tracking branch 'origin/3.1' into 3.2 2016-05-13 16:50:09 +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
Damian Mooyman
2aa2d9a7f0 Merge pull request #121 from sminnee/revert-ext-tidy
Revert "Require php-tidy for dev dependencies (#87)"
2016-05-11 17:46:13 +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
Daniel Hensby
cc7a2aeb1e FIX Add framework/admin tests (#118) 2016-05-06 07:43:27 +12:00
Ingo Schommer
f52cfeef87 Merge pull request #117 from open-sausages/pulls/4.0/include-asset-admin
API Include asset-admin module in installer
2016-05-04 19:36:29 +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
3c8fc9177c
Merge branch '3' 2016-04-26 02:40:35 +01:00
Daniel Hensby
8e7d591075
Merge branch '3.3' into 3 2016-04-26 02:05:25 +01:00
Daniel Hensby
1c1b277c93
Merge 3.2 into 3.3 2016-04-26 02:04:36 +01:00
Daniel Hensby
71971adc8f Merge pull request #113 from tractorcow/pulls/4.0/update-assets
API Replace old assets/.htaccess with better default
2016-03-22 11:30:50 +00:00
Damian Mooyman
8366d22a19 API Replace old assets/.htaccess with better default 2016-02-26 14:05:55 +13: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
Jono Menz
0ef455f2b7 Merge pull request #111 from schellmax/patch-1
Added siteconfig installation requirement
2015-12-07 11:38:45 -08:00
Matthias Schelling
d55468b02e Update README.md
Add 'siteconfig' module to list of required modules (as SilverStripe installation gives errors when installing without)
2015-12-06 13:53:28 +01:00
Peter Thaleikis
cad28ceff1 tab -> space in editorconfig 2015-11-30 17:19:01 +13:00
Daniel Hensby
eeec7be996 Merge branch '3' 2015-11-10 10:55:37 +00:00
Daniel Hensby
0f0e4e85a5 Merge branch '3.2' into 3 2015-11-10 10:55:06 +00:00
Daniel Hensby
0572ce7a9a Merge branch '3.1' into 3.2 2015-11-10 10:54:37 +00:00
Damian Mooyman
df6cbb20f7 Merge pull request #108 from dhensby/pulls/keep-htaccess
.gitignore re-organisation
2015-11-10 23:34:11 +13:00
Daniel Hensby
b28f567d30 Remove local IDE cache folders from .gitignore
These are environment specific and who's to judge which are worthy and which aren't. Devs should ignore this at an environment level: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
2015-11-10 10:30:16 +00:00
Daniel Hensby
b73a8cc724 Reorganise .gitignore file 2015-11-10 10:30:15 +00:00
Daniel Hensby
04088a13ea Merge pull request #106 from nickspiel/patch-1
Allowing SVGs in the assets directory
2015-10-29 17:32:56 +00:00
Nick Spiel
6346004398 Allowing SVGs in the assets directory
This should be combined with a PR I have started on silverstripe-framework https://github.com/silverstripe/silverstripe-framework/pull/4669
2015-10-08 17:35:42 +11: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
Damian Mooyman
00d26d5f2d Merge pull request #102 from sminnee/prefer-stable-releases
Prefer stable packages while still allowing dev ones. Fixes #100
2015-07-08 11:11:30 +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
Daniel Hensby
e90f8ccd6c Merge pull request #99 from SpiritLevel/patch-3
Update min php version
2015-06-25 13:38:31 +01:00
Daniel Hensby
d73fc01638 Merge pull request #98 from SpiritLevel/patch-2
Updated minimum php version
2015-06-25 13:38:13 +01:00
Daniel Hensby
87424a68a9 Merge pull request #97 from SpiritLevel/patch-1
DOCS: updated min php version
2015-06-25 13:38:01 +01:00
David Alexander
357ab55b18 Update min php version 2015-06-25 12:44:12 +12:00
David Alexander
dec0b889ad Updated minimum php version 2015-06-25 12:42:57 +12:00
David Alexander
8b01500530 DOCS: updated min php version
updated minimum php version to 5.3.3 in doc block
2015-06-25 12:16:03 +12:00
Damian Mooyman
24f7cd12be Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:50:26 +12:00
Damian Mooyman
ae3c7ebcaf Merge pull request #94 from dhensby/pulls/iis-fix
FIX Invalid comment syntax for web.config
2015-06-19 10:21:59 +12:00
Daniel Hensby
f7f92b3226 FIX Invalid comment syntax for web.config
This breaks the site on IIS
2015-06-18 11:31:19 +01: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
Sam Minnée
d92419ec10 Merge pull request #92 from tractorcow/pulls/3.1.14/fix-api
Ensure BlockUntrustedProxyHeaders is enabled by default
2015-06-02 12:42:56 +12:00
Damian Mooyman
d467b16bf2 Ensure BlockUntrustedProxyHeaders is enabled by default 2015-06-02 12:29:23 +12:00
Damian Mooyman
e759ffbcdc Enforce trusted proxy servers 2015-05-28 10:03:42 +12:00
Damian Mooyman
9f686e0908 BUG Fix broken xml comment 2015-03-09 18:34:17 +13:00
Damian Mooyman
38ee2f9a1d Merge pull request #86 from assertchris/feature/3.1/add-phpunit-to-dev-dependencies
Added phpunit to dev dependencies
2015-02-26 14:32:49 +13:00
Damian Mooyman
ed05c0f509 Merge pull request #71 from silverstripe/pulls/cleanup-root-files
Cleanup of root files
2015-02-26 14:32:13 +13:00
Damian Mooyman
4b2117ab8d Merge pull request #82 from dhensby/pulls/fix-58
FIX Requests to root dir circumvent index.php
2015-02-26 14:29:45 +13:00
Christopher Pitt
f04263d5da Added phpunit to dev dependencies 2015-02-26 14:29:38 +13:00
Damian Mooyman
8f58045f09 Merge pull request #84 from assertchris/feature/3/add-phpunit-to-dev-dependencies
Added phpunit to dev dependencies
2015-02-26 14:26:31 +13:00
Christopher Pitt
5d5e614b38 Added phpunit to dev dependencies 2015-02-26 14:21:47 +13:00
Damian Mooyman
0ee2493db2 Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 12:03:02 +13:00
Daniel Hensby
066fd84452 FIX Requests to root dir circumvent index.php
fixes #58
2015-02-16 16:36:23 +00:00
Damian Mooyman
c9cb22f648 Merge pull request #81 from guru-digital/3.1
Fix #79
2015-02-16 11:34:40 +13:00
Corey Sewell
9b2b0b5c31 Fix #80 2015-01-20 13:28:05 +13:00
Damian Mooyman
ef770ca42d Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
2015-01-16 10:35:26 +13:00
Damian Mooyman
f834c69435 Merge remote-tracking branch 'origin/3.1' into 3 2015-01-15 18:58:01 +13:00
Damian Mooyman
2742f63c79 Merge pull request #77 from JorisDebonnet/patch-1
.htaccess: support for MS Office template / macro files
2015-01-15 14:32:50 +13:00
Damian Mooyman
4d8ab05f90 Revert #78
Fixes #79
2015-01-12 17:38:50 +13:00
Daniel Hensby
a7f82d2fee Merge pull request #78 from cjsewell/patch-1
Add rewrite rule to enable Basic auithentication workaround for PHP running in CGI mode
2014-12-08 18:44:33 +00:00
Corey Sewell
b2ee11a7be Add rewrite rule to enable Basic auithentication workaround for PHP running in CGI mode
See https://github.com/silverstripe/silverstripe-framework/pull/3689
2014-12-09 07:36:46 +13:00
Will Rossiter
3a4f346a61 Merge pull request #76 from dhensby/3.1
Adding .editorconfig
2014-12-05 15:22:23 +13:00
JorisDebonnet
3bc40bd2bf .htaccess: support for MS Office template / macro files
Fixes silverstripe-framework's issue 3692 (..no idea how to link that!).
2014-12-04 21:57:08 +01:00
Daniel Hensby
4b0911d1b5 Adding .editorconfig 2014-12-04 15:49:54 +00: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
Damian Mooyman
c77022e260 Merge pull request #73 from chillu/pulls/htaccess-doc
Improve .htaccess commenting
2014-11-19 08:51:18 +13:00
Ingo Schommer
e1649cf74f Improve .htaccess commenting
Done alongside improvements of the execution-pipeline.md docs.
Installer comment taken from d5723f7b0e
2014-11-19 08:31:04 +13:00
Ingo Schommer
70f2e90efb Removed obsolete phpunit.teamcity.*.xml files
Builds are no longer run on TeamCity for these.
2014-09-23 18:24:47 +12:00
Ingo Schommer
d2f639b1af Info about utility files, note about their removal 2014-09-23 18:22:46 +12:00
Ingo Schommer
787fc2aacf Remove Makefile, running tests through phpunit is established enough now 2014-09-23 18:16:27 +12:00
Sean Harvey
c23348d5d1 Merge pull request #66 from simonwelsh/stupid-htaccess
Don't block rewriting .php URLs
2014-08-18 10:54:04 +12:00
Sean Harvey
40ebbb1ae0 Merge pull request #68 from dhensby/patch-1
DOCS assets/.htaccess
2014-08-18 10:17:40 +12:00
Daniel Hensby
69761d0949 DOCS assets/.htaccess
Updating the docs to reflect the actual rules
2014-08-17 15:38:39 +01:00
Simon Welsh
91d79860bd Don't block rewriting .php URLs 2014-08-16 22:01:27 +10:00
Damian Mooyman
4e6e8f1dbc Merge pull request #65 from JLeft/patch-1
Corrected capitalisation of 'GitHub'
2014-06-18 08:35:16 +12:00
JLeft
bf642b09e0 Capitalisation of 'GitHub' 2014-06-17 13:17:05 +01:00
Ingo Schommer
0c9539942f Revert accidental commit to behat.yml (setting a specific base URL) 2014-06-16 08:51:41 +12:00
Ingo Schommer
f7c23b9007 Merge remote-tracking branch 'origin/3.1' 2014-06-16 08:44:42 +12:00
Ingo Schommer
10dc891fee Removed goutte driver from Behat, not supported
Was added way back with the original behat.yml, and then forgotten about
2014-06-16 08:41:57 +12:00
Damian Mooyman
b3acbcfa5f Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-01 08:52:34 +13:00
Ingo Schommer
3b3cda59d2 Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:38:26 +13:00
colymba
aa07a0edd8 BUGFIX #34 Only block root vendor folder
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.

Move to RewriteRules
2014-02-18 22:37:49 +13:00
Sean Harvey
16c9312f29 Merge pull request #61 from silverstripe/pulls/remove-tutorial
Remove tutorial theme
2014-02-02 14:31:29 -08:00
Ingo Schommer
a31512afc8 Remove obsolete tutorial theme (fixes #60) 2014-02-03 08:11:28 +13:00
Ingo Schommer
1098bdee31 Merge pull request #35 from colymba/3.0-htaccess-fix
BUGFIX #34 block vendor access only if outside themes
2013-12-19 16:39:35 -08:00
Ingo Schommer
6ba8838239 Merge pull request #59 from oddnoc/yaml-syntax
Correct YAML syntax
2013-12-19 16:17:22 -08:00
Fred Condo
d80afcf5b6 Correct YAML syntax 2013-12-19 15:04:46 -08:00
Ingo Schommer
c7fe54d082 Merge pull request #56 from gordonbanderson/3.1
Addition of gpx and kml files to 3.1
2013-11-22 04:32:41 -08:00
Will Rossiter
50dff80399 Merge pull request #55 from jonom/patch-1
Removed misleading comments and legacy requirement calls
2013-11-11 21:28:44 -08:00
Gordon Anderson
72e8ae0b87 Addition of geographical file formats (gpx,kml) 2013-11-12 11:39:12 +07:00
Gordon Anderson
68b8b08b2c Addition of geographic files (gpx, kml) 2013-11-12 11:37:26 +07:00
jonom
e0ce35217c Removed misleading comments and legacy requirement calls
The instructions in the init() function seem to be at odds with the current documentation which suggests that it is preferable to include requirements in PHP code rather than in templates.

Also the requirement calls here are supposedly included so that older themes still work - but how old are we talking? I would assume that these older themes would not be compatible with SS3.1, and the bundled Simple theme does not need these requirement calls in the init() function, making them redundant.

I am guessing that the Installer is primarily used by people just getting started with SilverStripe, so ideally this bundled example Page.php should provide a clear pathway to best practice SS development, rather than supporting out-dated code.
2013-11-11 09:22:36 +07:00
Ingo Schommer
1e729183c8 Show snippets in behat.yml defaults, more dev friendly
They should be hidden in CI, but its more of a cleanliness
activity, while snippets are a great time saver for devs
that they shouldn't need to go hunting for via CLI params.
2013-10-21 13:17:43 +02:00
Ingo Schommer
20b3957c78 Merge remote-tracking branch 'origin/3.1' 2013-10-21 00:08:50 +02:00
Ingo Schommer
f62874d001 Exclude @todo from behat runs by default 2013-10-21 00:08:33 +02:00
Ingo Schommer
304cb25808 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-19 12:02:28 +02:00
Will Rossiter
a90c403b05 Merge pull request #51 from stevie-mayhew/patch-1
Correct paths for framework and cms issues
2013-10-07 00:02:02 -07:00
Stevie Mayhew
cd30cdd0af MINOR: correct paths for framework and cms issues 2013-10-07 09:16:11 +13:00
Ingo Schommer
69a19b220d Link to both framework and cms issues in README 2013-10-02 16:02:55 +02:00
Ingo Schommer
dae9b18558 Merge tag '3.0.7-rc1' into 3.0 2013-09-27 00:21:56 +02:00
Ingo Schommer
1434fedf10 Tagged 3.1.0-rc3 2013-09-26 01:42:31 +02:00
Ingo Schommer
2a70eedee1 Tagged 3.0.7-rc1 2013-09-26 01:32:46 +02:00
Ingo Schommer
0d5eab3a5f Tagged 3.0.6 2013-09-26 00:35:09 +02:00
Ingo Schommer
e86bb3020b Behat: Hide snippets by default, exclude @todo tags 2013-09-14 22:25:16 +02:00
Ingo Schommer
f80f7a5291 Tagged 3.0.6-rc2 2013-09-12 16:48:20 +02:00
Ingo Schommer
b1eba0f9b9 Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	composer.json
2013-08-07 20:37:03 +02:00
Ingo Schommer
69889ec786 Updated SS logo sample file 2013-08-07 20:36:28 +02:00
Sam Minnee
77ef39fedd 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.
2013-08-07 14:40:34 +02:00
Ingo Schommer
cff42f2338 Merge remote-tracking branch 'origin/2.4' into 3.0 2013-08-03 15:12:24 +02:00
Ingo Schommer
c76cce5e4a Merge pull request #47 from hafriedlander/fix/flush_24
FIX Include flushtoken when install redirects to successfullyinstalled
2013-08-03 04:56:38 -07:00
Hamish Friedlander
f27fb07e4d FIX Include flushtoken when install redirects to successfullyinstalled 2013-08-02 10:53:35 +12:00
Sean Harvey
24892c6b66 Merge branch '3.1' 2013-07-30 14:43:37 +12:00
Stig Lindqvist
d4e5748835 Merge pull request #44 from silverstripe/remove_post_scripts
Fixing regression in composer post scripts
2013-07-29 17:03:47 -07: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
Simon Welsh
8b76cb8fb9 Merge branch '3.1' 2013-07-01 13:01:14 +12:00
Simon Welsh
0b59ef4026 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-07-01 13:00:52 +12:00
Simon Welsh
4fd75527dc Block access to .yaml files as well as .yml 2013-07-01 12:59:31 +12:00
Ingo Schommer
623685aedc Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-03 10:32:30 +02:00
Ingo Schommer
93f206a125 Revert composer.lock addition, unclear usage, breaks builds
Partially reverts e9f13512dc

This caused two issues in Travis builds:
 * CMS builds were using
outdated framework dependencies. Example: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/7718686
 * Modules weren't building
at all because the info in the lock file overwrote the custom
composer.json. Example: https://travis-ci.org/silverstripe/silverstripe-translatable/jobs/7726954

In addition, I don't agree with having lock files on release branches
(as opposed to tags), since it forces us to permantently update lock
files or work with stale dependencies even when on branches
(most likely not the developers intention).
2013-06-03 10:27:04 +02: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
Sean Harvey
f283290e2a Merge pull request #42 from sminnee/composer-post-install
NEW: Added post-install and post-update dev/build call.
2013-05-29 21:57:55 -07:00
Sam Minnee
c88c6af039 Merge branch '3.0' into 3.1 2013-05-30 16:28:36 +12:00
Sam Minnee
e9f13512dc git commit -m "FIX: Move install composer.json to use self.version.
Now that Composer has been fixed, self.version can be used as a dependency for framework
and cms in installer.  This simplifies our composer.json, and meanst that we can commit
composer.lock into the repo, as required.  An annoying piece of our release process has
been solved!
2013-05-30 16:27:27 +12: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
Ingo Schommer
16c72aacb6 Merge pull request #41 from uniun/HTML5-video-file-types
HTML5 video file types.
2013-05-29 08:36:26 -07:00
Elvinas
7403a844e0 HTML5 video file types. 2013-05-27 21:32:04 +03:00
Simon Welsh
dbe882c11e Merge pull request #40 from NightJar/hackfest_may_2013
case insensitive the assets/ allowed extensions for Apache
2013-05-25 01:09:47 -07:00
Nightjar
04be573187 case insensitive the assets/ allowed extensions for Apache 2013-05-25 19:43:13 +12:00
Ingo Schommer
0975787f00 Updated github path 2013-05-17 00:51:03 +02:00
Ingo Schommer
16380f68bf Updated github path 2013-05-17 00:49:19 +02:00
Ingo Schommer
a11f4be84a Merge pull request #39 from sminnee/composer-uses-self-version
FIX: Put self.version in composer dependencies.
2013-05-13 02:19:26 -07: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
c929a5944d Updated behat.yml to reflect changes in behat-extension module 2013-05-09 16:00:50 +02:00
Sam Minnée
08b3685927 Merge pull request #36 from chillu/pulls/require-dev
Remove require-dev section, composer doesn't handle it well
2013-05-07 02:54:56 -07: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
colymba
7085f074d2 BUGFIX #34 Only block root vendor folder
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.

Move to RewriteRules
2013-04-27 15:58:31 +03:00
Ingo Schommer
1aca785e6d Merge pull request #29 from chillu/pulls/gitattributes
Ignore build-related files in "git archive" (fixes #8167)
2013-04-18 09:32:56 -07:00
Sean Harvey
b0188e9bfd Merge pull request #32 from sunnysideup/patch-1
IIS 7.5 does not like forward slash at the end of silverstripe-cache
2013-04-02 19:56:14 -07:00
Nicolaas
5c91cc1f61 IIS 7.5 does not like forward slash at the end of silverstripe-cache
IIS 7.5 does not like forward slash at the end of silverstripe-cache
2013-04-03 15:54:31 +13:00
Ingo Schommer
f35ca6470c Merge remote-tracking branch 'origin/3.1' 2013-04-02 02:04:33 +02:00
Ingo Schommer
b466217548 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-04-02 02:03:40 +02:00
Ingo Schommer
2e4913d351 Contribution guidelines, new bugtracker links 2013-04-02 01:52:32 +02:00
Ingo Schommer
27f63fe19f Updated bugtracker links 2013-04-02 01:19:15 +02:00
Ingo Schommer
d640f826d0 Removed @stable markers from 2.4 dev branch 2013-03-27 16:00:14 +01:00
Ingo Schommer
cd56f026ce Merge remote-tracking branch 'origin/3.1'
Conflicts:
	composer.json
2013-03-26 01:22:48 +01:00
Sam Minnee
fbb4d1c42b FIX: Update Page/Page_Controller statics to match new 3.1 expectations. 2013-03-25 14:38:58 +13:00
Ingo Schommer
bac9e2fc00 Added mysite/_config/config.yml, removed obsolete PHP config (#8317) 2013-03-21 20:02:42 +01:00
Ingo Schommer
f8762ef204 Removed MySQLDatabase::set_connection_charset() from default config
Its now part of the core default YAML settings
2013-03-15 18:01:50 +01: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
b737ad1341 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-20 13:26:08 +01:00
Ingo Schommer
3c6ef63734 Merge branch '3.0.5' into 3.0 2013-02-20 12:17:01 +01:00
Ingo Schommer
0e0ce2e1e3 API Defaulting composer core dependencies to to @stable
Required to ensure correct operation of
"composer create-project silverstripe/installer my-path 2.4.10"
(checkout with tags).
2013-02-20 11:04:04 +01:00
Ingo Schommer
4e885dd297 Forcing stable flags for release 2013-02-20 01:44:23 +01:00
Hamish Friedlander
becc5baa34 API Block all yaml files by default, to reduce the change of information leakage 2013-02-17 22:16:11 +01:00
Ingo Schommer
98135df7d3 Prevent YAML access in IIS by default (fixes #8233)
Since SS3 keeps values in configuration, direct access
to known paths might expose them
2013-02-17 21:04:58 +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
23523175f3 API Filter composer files in IIS and Apache rules (fixes #8011)
They can expose version information, so shouldn't be accessible
through the web. The better solution of course is to move
to a public/ subfolder application structure.
2013-02-15 19:13:41 +01:00
Ingo Schommer
377a68848e Ignore build-related files in "git archive" (fixes #8167)
This is useful for keeping standard "composer create-project"
checkouts clean. Unless they use "--keep-vcs", in which case
.gitattributes is (correctly) ignored.

This has the side effect that archive-checkouts can't
run phing or phpunit scripts, but I think that's
acceptable.
2013-01-14 18:32:43 +01:00
Sean Harvey
5d78b046bb Merge pull request #27 from halkyon/htaccess_fix
Fixing .htaccess to ignore rewriting PHP files directly
2013-01-06 17:24:55 -08: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
10d447e15a API Removed 'make getallmodules', use composer instead 2012-12-11 02:03:49 +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
738d9dbff6 Added phing support 2012-12-05 11:58:43 +01:00
Ingo Schommer
736856fbd7 Removed composer.lock 2012-12-05 01:11:21 +01:00
Ingo Schommer
08c349574b Added composer.lock for 2.4.9 2012-12-05 01:11:21 +01:00
Ingo Schommer
9c254cd72b Added @stable markers to composer.json 2012-12-05 01:10:13 +01:00
Ingo Schommer
2ea9f262e8 Support for composer-created themes dir structure
Due to git limitations, we can't check out the blackcandy
"parent" theme into themes/blackcandy/ directly, since that
would require sharing paths with git repositories of other themes.
2012-12-04 17:21:29 +01:00
Sean Harvey
d74da7ba29 Fixing .htaccess to ignore rewriting PHP files directly 2012-12-04 14:34:54 +13:00
Ingo Schommer
5c1a16f93c Merge pull request #26 from chillu/pulls/buildtools
Moved phing build tools to separate project
2012-12-03 14:53:30 -08: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
9fa3c52169 Exclude vendor/ folder from default phpunit run
Once we start placing SS modules in vendor/,
we need to find a smarter solution...
2012-11-28 15:47:28 +01: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
b3b2716e57 Add 3.0.3 composer.lock file 2012-11-26 12:02:04 +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
49c8cf9dd7 Updated phpunit.xml.dist docs 2012-11-23 15:21:16 +01:00
Ingo Schommer
6f8902c5f0 Less verbose phpunit.xml.dist by omitting default switches
See http://www.phpunit.de/manual/current/en/appendixes.configuration.html
2012-11-23 15:20:10 +01:00
Ingo Schommer
69ff09d73e Removed strict and verbose flags from default PHPUnit
It complains when *any* output was caused during test
runs, which is confusing for the typical var_dump()
debugging style.
2012-11-23 15:18:47 +01:00
Ingo Schommer
96e56a8246 API Removed 'new-project' command
Use 'compass create-project silverstripe-installer' instead
2012-11-21 16:17:32 +01:00
Ingo Schommer
8b6864468b API Moved build tools to new silverstripe-buildtools module 2012-11-21 16:17:30 +01:00
Ingo Schommer
8e074cdfee Added silverstripe/behat-extension to require-dev 2012-11-18 11:42:10 +01:00
Sam Minnee
472f046539 Added colour to 'phing behat' command 2012-11-17 13:49:07 +13:00
Sam Minnée
0f28a3d456 Merge pull request #24 from chillu/pulls/behat
Added 'phing behat' command
2012-11-15 18:35:17 -08:00
Sean Harvey
f5770a0781 Merge pull request #25 from chillu/pulls/remove-compass
Remove compass dependency, too slow even for development at the moment
2012-11-15 15:34:20 -08:00
Ingo Schommer
47b839db79 Remove compass dependency, too slow even for development at the moment
Use compass on CLI instead, or re-add the module manually
via "composer require".

See https://github.com/silverstripe-labs/silverstripe-compass/issues/9
2012-11-16 00:16:48 +01:00
Ingo Schommer
64b1d07c78 Don't include composer.json in release packages 2012-11-15 18:52:21 +01:00
Ingo Schommer
d16d6adeb3 Added default behat.yml 2012-11-15 18:52:21 +01:00
Ingo Schommer
cb0726dae3 Added 'phing behat' command 2012-11-15 18:52:21 +01:00
Ingo Schommer
4e1e09de75 Merge branch 'pulls/phpunit-composer' into 3.0 2012-11-15 17:06:23 +01:00
Ingo Schommer
e07ae2041a NEW Added "phing phpunit" target 2012-11-15 17:00:46 +01:00
Ingo Schommer
04ce08b886 Require PHPUnit as dev dependency through Composer 2012-11-15 16:02:57 +01:00
Stig Lindqvist
8347a7f225 Updated license in readme to include year 2012 2012-11-13 22:36:08 +13:00
Ingo Schommer
a2501ad209 Fixed bootstrap.php path in phpunit.xml.dist 2012-11-09 11:48:34 +01:00
Sam Minnee
7898f89fb3 Reverted junk-commits from "Removed .mergesources.yml, not used since the dark SVN days"
This partially reverts commit 744605d21a.
2012-11-09 10:00:11 +13:00
Ingo Schommer
f976ed95a5 Fixed composer.json regression from 2.4 merge 2012-11-08 20:03:10 +01:00
Ingo Schommer
c1f8635753 Added composer.lock and vendor/ to .gitignore 2012-11-08 19:52:46 +01:00
Ingo Schommer
ff0939fe0d Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	composer.json
2012-11-08 19:51:44 +01:00
Ingo Schommer
744605d21a Removed .mergesources.yml, not used since the dark SVN days 2012-11-08 14:03:39 +01:00
Ingo Schommer
f8e860fac1 Removed .mergesources.yml, not used since the dark SVN days 2012-11-08 14:03:14 +01:00
Ingo Schommer
157a275855 Removed custom repo sources from composer.json
We now own the packagist.org repos, no need for manual pointers.
2012-11-08 14:02:28 +01:00
Sean Harvey
f30759ec28 Updating favicon 2012-11-05 10:38:13 +13:00
Sean Harvey
2debb0ddfd Updating favicon 2012-11-05 10:34:24 +13:00
Sam Minnee
71b8b65858 NEW: Added dev dependencies to composer.
FIX: Don't hardcode framework and cms version in installer.
2012-11-04 21:24:59 +13:00
Ingo Schommer
0f83cfc33d Removed custom repo sources from composer.json
We now own the packagist.org repos, no need for manual pointers.
2012-11-01 18:29:16 +01:00
Ingo Schommer
6d7a0f59e7 Added composer.json
Once we've sorted out packagist listing ownership,
we should be able to remove the custom repository entries.
2012-11-01 17:26:18 +01:00
Ingo Schommer
236bad2cbc Merge remote-tracking branch 'origin/2.4' into 3.0 2012-10-30 17:21:49 +01:00
Ingo Schommer
cceee896b6 Release script feedback 2012-10-30 17:10:05 +01:00
Ingo Schommer
570744f658 phing upload-release (modified copy from master) 2012-10-16 11:18:22 +02:00
Ingo Schommer
1ddd85cde3 Added github-compatible contributing notes 2012-10-11 17:20:16 +02:00
Ingo Schommer
27282d7deb Updated dependent modules file 2012-09-12 11:23:35 +02:00
Simon Welsh
0761de7a2f FIX Include query parameters when redirecting to files from index.php (fixes #7823) 2012-08-30 10:01:29 +12:00
Ingo Schommer
3a531ddb20 BUG UpdateTranslationsTask YML regex (fixes #7707)
Wasn't detecting composite keys (separated by dots)
properly in temporary YML conversion, so messed up the
YML structure, effectively "hiding" and rearranging
translations values within the wrong keys.
2012-08-06 10:37:05 +02:00
Hamish Friedlander
b39744c3e7 BUG translations-sync was failing due to leakage
translations-sync was failing after calling i18nTextCollector because it
wasnt specifying a module. This mean that running translations-update-git-masterfile for framework
it would then fail on cms because wed already created a cms/lang/en.yml file
2012-07-25 12:05:12 +12:00
Stig Lindqvist
e00d3b596a Merge pull request #20 from silverstripe-droptables/fix-build-xml
BUG Remove the xml brackets from the string. Breaks phing.
2012-07-23 20:27:47 -07:00
Mateusz Uzdowski
6225f9c8c0 BUG Remove the xml brackets from the string. Breaks phing. 2012-07-24 14:38:46 +12:00
Ingo Schommer
b3787dc7e3 NEW phing translations-mergeback 2012-07-13 14:18:17 +02:00
Ingo Schommer
2be8924b7c Accepting "FIX" notation in changelog generator script 2012-07-05 18:16:35 +02:00
Ingo Schommer
e96de6cc7e Merge branch 'master' into 3.0 (one-off)
This is a one-off merge in the direction master->3.0,
to ensure all bugfixes since we branched off find
their way into the next micro/minor release.
From now on, we'll commit to the latest release branch,
and merge back to master. API changes should go into
the master branch (not merged into a release branch).
2012-07-05 18:01:47 +02:00
Ingo Schommer
2ac206c3e4 Merge branch '3.0' 2012-07-05 18:01:34 +02:00
Ingo Schommer
3e24385e31 Merge branch '3.0' 2012-07-05 18:00:03 +02:00
Ingo Schommer
b3e8696fdb Enforce flush on CI test runs
Would be better handled by an explicity "clear manifest" task,
but that's the best we can do for now. Necessary because
of removed 'flush' setting from bootstrap.php, see
https://github.com/silverstripe/sapphire/pull/620
2012-07-05 14:26:10 +02:00
Ingo Schommer
c8dbcf73a3 PHPUnit XML configs for other db drivers on TeamCity 2012-07-04 14:13:26 +02:00
Ingo Schommer
1ca61a5c22 Updated 'phing changelog' to work with new commit tags 2012-06-27 11:55:44 +12:00
Ingo Schommer
00a7451b1c Updated 'phing changelog' to work with new commit tags 2012-06-27 00:29:38 +02:00
Ingo Schommer
5cad54578c MINOR Auto conflict merges in phing translation tasks
Also set some default values when targets are executed
individually, and ensure that text collection fails the build if required
2012-06-25 17:37:37 +02:00
Ingo Schommer
6dfd99a313 MINOR Ignore stash errors in phing build task 2012-06-25 14:11:41 +02:00
Ingo Schommer
029c14b30a MINOR Phing checkout bug when branch doesn't exist
Solved by using --force instead, which hard resets to the tracking origin
2012-06-25 13:41:48 +02:00
Ingo Schommer
04cf94ff76 MINOR Getlocalization phing target fixes
- Fixed combined locale setting in generated files (broke en_GB etc)
 - Prompting for property names
 - Fixed YAML parsing and git commands
2012-06-25 09:31:37 +02:00
Ingo Schommer
17303c6e9f MINOR getlocalization API URL
Using www.* instead of api.* endpoint as recommended by GL support,
to avoid timeouts when generating large ZIPs.
(see http://getlocalization.zendesk.com/requests/1736)
2012-06-25 01:03:50 +02:00
Ingo Schommer
00f66e201f ENHANCEMENT getlocalization build support
Squashed commits (sorry, too hard to untangle):
- Moved descriptions from custom "phing help" target
to the more standard 'phing -l' command, which keeps
the descriptions in one place, rather than duplicating
them between xml comments, "description" attrs and the "help" target.
- Prefixed helper targets to make it clear that they're internal
(= require temporary properties to work)
2012-06-22 15:42:07 +02:00
Sam Minnee
d5b72a8754 MINOR: Fixed bug in release script. 2012-06-18 18:08:00 +12:00
Sam Minnee
941ffa7652 MINOR: Added auto-emailing to automated release upload script. 2012-06-18 18:03:36 +12:00
Sam Minnee
44d93e4588 MINOR: Updated Phing to handle more of release/nightly creation. Combined cms and framework into a single script. 2012-06-18 12:29:15 +12:00
Ingo Schommer
b3e60f1894 Merge pull request #16 from stojg/loadmodules-cli-error
BUGFIX: CLI error on LoadModulesTask_GitLoader::update()
2012-06-14 11:23:00 -07:00
Ingo Schommer
5f029fd98d Merge pull request #17 from stojg/phing-installation-instructions
MINOR Update phing installation instructions
2012-06-14 11:22:11 -07:00
Stig Lindqvist
476532b006 MINOR dependent-modules.default should showcase SQLite3 from silverstripe-labs 2012-06-13 16:09:25 +12:00
Stig Lindqvist
393cc335cf MINOR Update phing installation instructions 2012-06-13 14:15:00 +12:00
Stig Lindqvist
313cb6a5b3 BUGFIX: CLI error on LoadModulesTask_GitLoader::update()
This fixes:

 - git would complain when doing git checkout {branch name} when already on {branch name}
 - the current branch was not calculated correctly 
 - removed unused variable
2012-06-13 14:02:16 +12:00
Sam Minnée
284eec1852 Merge pull request #14 from mateusz/update_modules_typo
BUGFIX: fix the gitignore updates done by phing update_modules
2012-05-30 17:05:18 -07:00
Mateusz Uzdowski
095f35528e BUGFIX: fix the gitignore updates done by phing update_modules 2012-05-31 12:02:55 +12:00
Ingo Schommer
039a37230f MINOR Fixed phpunit bootstrap relative path 2012-05-29 15:57:55 +02:00
Sam Minnee
4bb7d6a940 MINOR: Simplified phpunit files so that they work with PHPUnit 3.5 2012-05-28 18:20:46 +12:00
Sam Minnee
792df1e249 MINOR: Added phpunit config specifically for teamcity (different listeners) 2012-05-28 16:17:53 +12:00
Ingo Schommer
b7c8737de6 SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205) 2012-05-16 15:05:22 +02:00
Sean Harvey
aae4f9e749 MINOR Adding .DS_Store to .gitignore 2012-05-11 14:44:22 +12:00
Sean Harvey
21dda5f304 BUGFIX Fixing including of thirdparty tests when using phpunit.xml
(requires PHPUnit 3.6, so marking that as the minimum requirement in
comments)
2012-05-09 22:35:14 +12:00
Sam Minnée
5cd1253ab8 Merge pull request #13 from adrexia/tutorial-doctype-update
BUGFIX: Tutorial template fixes
2012-04-26 22:42:30 -07:00
Naomi Guyer
e03d576f55 BUGFIX: Tutorial template fixes
Re-added lang encoding, and added title attribute
2012-04-27 17:16:50 +12:00
Will Rossiter
28b2704d0c Merge pull request #12 from adrexia/tutorial-doctype-update
BUGFIX: Update tutorial theme doctype to html5
2012-04-26 21:00:59 -07:00
Naomi Guyer
b7d4ed887c BUGFIX: Tutorial theme doctype
Update doctype to use html5 rather than xHTML. Prevents unformed XML
error
2012-04-27 14:40:56 +12:00
Ingo Schommer
c233f29036 Merge pull request #11 from silverstripe-big-o/simple-theme-installer-integration
Simple theme installer integration
2012-04-24 01:47:25 -07:00
Julian Seidenberg
bd74ba4985 BUGFIX: updating theme to "Simple" in change log creator and documentation 2012-04-24 15:56:20 +12:00
Julian Seidenberg
322d3926ae ENHANCEMENT: adding checkout for the simple theme to the Phing checkout script 2012-04-24 15:46:56 +12:00
Julian Seidenberg
d2f5fc4bc9 MINOR: adding PHPStorm IDE files to the .gitignore 2012-04-24 15:46:31 +12:00
Sean Harvey
b57f66d8fc MINOR Adjusted PHP version recommendation 2012-04-20 15:13:47 +12:00
Sean Harvey
39966a8c3d MINOR Ensure "phing update_modules" updates from master, not 2.4.5 (that is done in the 2.4 branch) 2012-04-15 11:42:42 +12:00
Sean Harvey
448a729a29 MINOR Removed unused rewritetest.php 2012-04-14 20:16:27 +12:00
Sean Harvey
3450bad391 MINOR Tweaking words on framework missing 2012-04-14 19:28:05 +12:00
Simon Welsh
1a532faa60 API-CHANGE sapphire folder can now be renamed. 2012-04-14 12:53:12 +12:00
Ingo Schommer
2bef7cde4f Merge pull request #10 from robert-h-curry/7131-php-version-requirement
ENHANCEMENT: Change PHP version requirements in comments. Part of #7131.
2012-04-13 06:39:42 -07:00
Robert Curry
3e69c0dec8 ENHANCEMENT: Change PHP version requirements in comments. Part of #7131. 2012-04-13 13:04:01 +12:00
Ingo Schommer
ae4119ed14 MINOR Consistent styling of install-sapphiremissing.html (admittedly a bit pointless, since the new styles are placed in sapphire) 2012-04-11 18:06:56 +02:00
Ingo Schommer
70a3ca4b87 MINOR Removed special treatment of blackcandy in build scripts 2012-04-11 18:06:56 +02:00
Ingo Schommer
3abd264c30 MINOR Setting new default theme in standard mysite/_config.php 2012-04-03 01:15:10 +02:00
Ingo Schommer
c3ad42029e MINOR Updated new-project script to use "simple" theme 2012-03-28 22:53:32 +02:00
Ingo Schommer
41df04ff2b MINOR Added reset.css include to Page.php in order to fix inclusion order in new default theme 2012-03-26 15:14:07 +02:00
Will Rossiter
04732c1d0d Merge pull request #8 from silverstripe/fix-phpunit
BUGFIX: Correct location of bootstrap file so phpunit CLI works. (#7001)
2012-03-23 22:32:55 -07:00
Sam Minnee
e81f11a9aa BUGFIX: Correct location of bootstrap file so phpunit CLI works. (#7001) 2012-03-24 11:41:02 +13:00
Sam Minnée
a7343897dc Merge pull request #7 from robert-h-curry/config-change
MINOR: Make initial mysite/_config.php consistent with the generated one.
2012-03-08 20:35:35 -08:00
Robert Curry
1b6aac222d MINOR: Make initial mysite/_config.php consistent with the one generated by install.php. 2012-03-09 17:31:51 +13:00
Will Rossiter
f63f8b2d4d Merge pull request #6 from bluefuton/patch-1
MINOR: Comment fix in _config.php
2012-02-09 14:09:36 -08:00
Chris
da2eb7db02 Comment fix in _config.php 2012-02-09 15:36:55 +00:00
Ingo Schommer
44409c75ac MINOR Writing version information to silvestripe_version files in archive task 2012-02-01 18:15:43 +01:00
Ingo Schommer
812d904935 MINOR Prompting for version info in archive task 2012-02-01 18:15:29 +01:00
Ingo Schommer
1b8d1bebc7 MINOR Consolidated 'archive' and 'archiveTask' targets in build.xml (they belong into one definition) 2012-02-01 17:54:36 +01:00
Ingo Schommer
7464a47d83 MINOR Replaced custom verbose logging flags with standard log levels 2012-01-31 14:24:12 +01:00
Sean Harvey
c08645b3da MINOR Added silverstripe-cache and Eclipse specific metadata dirs/files to .gitignore 2011-10-30 11:04:31 +13:00
Hamish Friedlander
ceb45f9808 BUGFIX: Make default mysite/_config.php work when CMS module isnt installed 2011-10-29 17:04:21 +13:00
Hamish Friedlander
a0527ce846 MINOR: Update PHP requirements in notice 2011-10-29 15:56:51 +13:00
Hamish Friedlander
d5723f7b0e BUGFIX: If sapphire hasn't been installed as subdirectory, give error message rather than erroring out with a 500 or a php error 2011-10-29 15:53:41 +13:00
Hamish Friedlander
c7b6eab151 API CHANGE: Move the core install code to sapphire, leave just stub here 2011-10-29 15:53:30 +13:00
Hamish Friedlander
1463dbd5ae ENHANCEMENT: Allow specifying the directory to put the built archive 2011-10-29 12:55:31 +13:00
Hamish Friedlander
0e7ad4b5ce BUGFIX: Make archive task run if providing archivetype via phing -D argument 2011-10-29 12:08:22 +13:00
Hamish Friedlander
71d71dc3b6 MINOR: If blackcandy isn't included, or is already in the right place, dont error out 2011-10-29 12:01:20 +13:00
Ingo Schommer
1b90766e8b MINOR Replaced INSTALL, UPGRADING and ChangeLog files with a more consistent README 2011-10-19 09:12:03 +02:00
Ingo Schommer
4adccf7ca7 MINOR Excluding tests from release pacakges 2011-10-18 22:59:26 +02:00
Ingo Schommer
e323b233a3 MINOR Excluding tests from release pacakges 2011-10-18 22:58:56 +02:00
Ingo Schommer
9b4ed2c8b6 MINOR Excluding docs from release, as they bring the package size from 5mb to 8mb 2011-10-18 16:43:35 +02:00
Ingo Schommer
5dcd2f3cdd MINOR Excluding docs from release, as they bring the package size from 5mb to 8mb 2011-10-18 16:43:13 +02:00
Ingo Schommer
c5eaff4a16 MINOR gitignore 2011-10-18 16:35:00 +02:00
Ingo Schommer
0fdd330ef4 MINOR gitignore 2011-10-18 16:33:56 +02:00
Ingo Schommer
624c6d29c8 MINOR Creating release archives in parent folder by default, to avoid archiving the archive by accident 2011-10-18 16:33:08 +02:00
Ingo Schommer
078d5710b3 MINOR gitignore 2011-10-18 16:31:50 +02:00
Ingo Schommer
48649d6640 MINOR Creating release archives in parent folder by default, to avoid archiving the archive by accident 2011-10-18 16:31:04 +02:00
Ingo Schommer
3e694be734 MINOR Correct release archive name 2011-10-18 15:34:02 +02:00
Ingo Schommer
76b3c00ead MINOR Moving theme dirs when release packaging 2011-10-18 15:34:02 +02:00
Ingo Schommer
ff301f9ea9 MINOR Correct release archive name 2011-10-18 15:22:06 +02:00
Ingo Schommer
57e465409e MINOR Moving theme dirs when release packaging 2011-10-18 15:20:47 +02:00
Ingo Schommer
0bab1907d1 MINOR Merged back /tools 2011-10-18 14:56:17 +02:00
Ingo Schommer
4a805a4ef9 MINOR Fixed release archive file inclusions/exclusions 2011-10-18 14:55:14 +02:00
Ingo Schommer
b8397f5448 MINOR Don't auto-create an _ss_environment.php file 2011-10-18 12:56:50 +02:00
Ingo Schommer
7e36cdc48e MINOR Excluding build files from release packages 2011-10-18 12:56:47 +02:00
Ingo Schommer
ba55351c95 MINOR Fixed whitespace and greedy regex problems in changelog generator 2011-10-18 09:51:14 +02:00
Will Rossiter
8b08fa2058 Merge pull request #5 from simonwelsh/patch-2
BUGFIX: Quote RewriteBase to handle paths with spaces
2011-09-15 19:48:38 -07:00
simonwelsh
c1712dc992 Quote RewriteBase to handle paths with spaces 2011-09-14 19:46:49 +12:00
Ingo Schommer
3b9c569ed1 MINOR ArchiveTask now creates subfolder of the same name in the tar.gz/zip file (to avoid toplevel extracts) 2011-05-02 13:51:44 +12:00
Ingo Schommer
843becc676 MINOR Removed archive existence detection from build.xml 'archiveTask', doesn't work 2011-05-02 11:57:38 +12:00
Ingo Schommer
665b63b6a7 Merge branch 'phing-scripts' 2011-05-02 11:54:37 +12:00
Ingo Schommer
50cb45ba04 BUGFIX Fixed date sorting in CreateChangelog task, linking hashes, filtering 2011-05-02 11:54:16 +12:00
Ingo Schommer
2215f97afc MINOR Added "verbose" flag to SilverStripeBuildTask 2011-05-02 11:54:16 +12:00
Julian Seidenberg
23f5340c85 BUGFIX: direct call to exec method instead of trying to non-existent object attribute 2011-05-02 11:54:16 +12:00
Julian Seidenberg
6c549169ed BUGFIX: now dev/build does not always run after checkout 2011-05-02 11:54:16 +12:00
Julian Seidenberg
c98eb981ce BUGFIX: renaming task to callingTask to avoid conflict with superclass method in Task class 2011-05-02 11:54:15 +12:00
Julian Seidenberg
eb305ee33f API-CHANGE: piston support (from 1292fba039) 2011-05-02 11:54:15 +12:00
Julian Seidenberg
24705fd9f5 ENHANCEMENT: phing checkout task now stashes local content before performing checkout and has the option to exclude the base (silverstripe-installer) folder 2011-05-02 11:54:15 +12:00
Julian Seidenberg
73a5fb5e62 MINOR: documentation for phing tasks (run 'phing help' to view) 2011-05-02 11:54:10 +12:00
Julian Seidenberg
9e0c03d1d7 BUGFIX: createchangelog script now gives a message when it can't find a folder or repository. It now also correctly creates logs repos in subdirectories. 2011-04-26 15:32:21 +12:00
Julian Seidenberg
0ecaf0c45d API-CHANGE: new checkout and changelog tools using Phing 2011-04-26 13:57:55 +12:00
Will Rossiter
b74f07fbd6 ENHANCEMENT: added checks for reflection class and standard library methods. PATCH via vice (http://open.silverstripe.org/ticket/6603) 2011-04-19 11:04:56 +12:00
Will Rossiter
c80912bfb5 MINOR: fixed typo in installer. FIXES: #6602 2011-04-19 10:58:56 +12:00
Ingo Schommer
e4031aa344 MINOR Using QSA RewriteRule flag in .htaccess instead of manually appending (fixes #6593, thanks smares) 2011-04-14 21:07:17 +12:00
Howard Grigg
940df33c44 Updated the installer to reflect the moved Sapphire files 2011-04-06 11:22:34 +10:00
Hamish Friedlander
b39937f40e MINOR: Make new-project use github source for blackcandy theme, not svn 2011-03-31 11:52:27 +13:00
Sam Minnee
c5ce75fae4 Added a default .gitignore 2011-03-30 10:11:14 +13:00
Ingo Schommer
b3ac8ccbd6 MINOR Moved additional CSS needed for tutorial 3 to themes/tutorials rather than sapphire/docs 2011-02-14 11:08:51 +13:00
Ingo Schommer
7277461f28 MINOR Migrated COPYING, Changelog, INSTALL, UPGRADING into a new README.md 2011-02-12 14:28:05 +13:00
Hamish Friedlander
7b777c70e8 ENHANCEMENT: Add first version of tools for pulling in modules, now that we cant just use svn externals 2011-02-10 11:25:56 +13:00
sharvey
d8ee7bde57 BUGFIX #6321 Whitelisted file extensions with uppercase extensions blocked by case sensitive FilesMatch directive in assets/.htaccess (does not affect IIS 7.x which uses web.config) (from r115816)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@115819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-01-26 03:14:26 +00:00
sharvey
e1ad6609b4 ENHANCEMENT Installer now checks for magic_quotes_gpc being turned off. This option turned on can cause issues with serialized data in cookies when unserializing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@115264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-21 09:28:28 +00:00
sharvey
b13c561c51 BUGFIX Fixed conflicting check of mysite directory with recommendation of removal of _config.php in installer (from r115169)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@115170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-19 22:18:05 +00:00
sharvey
88aea2f456 Removed temporary datetimefields from externals
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@114918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-13 23:42:03 +00:00
sharvey
089e28e004 BUGFIX Installer should check asp_tags is disabled, as it can cause issues with SilverStripe (from r114823)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@114824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 06:02:51 +00:00
sminnee
3f55474dec ENHANCEMENT PHP requirements in installer now check for date.timezone correctly being set for PHP 5.3.0+. This option is *required* to be set starting with 5.3.0 and will cause an error during installation if not (from r114467)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@114495 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-05 00:04:05 +00:00
sharvey
4868877ee6 MINOR Merged r113913 through r113984 from phpinstaller/branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@113985 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-21 23:53:50 +00:00
sharvey
945a28f33a MINOR Merged r112269 through r113912 from phpinstaller/branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@113914 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-18 05:08:12 +00:00
sharvey
91d00c52b8 MINOR Fixed extraneous else statement in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-20 02:00:33 +00:00
sharvey
2ed6a316e7 MINOR Made _config.php work the same way as branches/2.4 phpinstaller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-20 02:00:13 +00:00
sminnee
9915ca80d9 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:24:40 +00:00
sminnee
01381abea0 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:23 +00:00
sminnee
93105a77ca MINOR Remove whitespace from generated _config.php file in installer (from r112268)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:20 +00:00
sminnee
d2bcf47aba ENHANCEMENT Installer exposes database type in "Database support" configuration (from r112247)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112432 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:10 +00:00
sminnee
5dc52e9569 ENHANCEMENT "Database Configuration" section in installer shows database version and database type (without the "Database" suffix) for reference (from r111874)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112430 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:04 +00:00
sminnee
3df7734b83 MINOR Documentation for phpunit.xml.dist (from r111491)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112429 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:58 +00:00
sminnee
4d5c62da03 BUGFIX Installer now checks for session_start() and hash() support (from r111369)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:45 +00:00
sminnee
3de082c417 BUGFIX Installer now checks for iconv support, which is required for DateField? (using Zend libraries) to function correctly (from r111266)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112425 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:21 +00:00
sminnee
df024e513e MINOR Exclude "sanity check" type tests by default from PHPUnit runs (e.g. PhpSyntaxTest) (from r111117)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112424 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:16 +00:00
sminnee
ec9ea4c8d6 ENHANCEMENT Added phpunit.xml.dist to avoid setting bootstrap includes and other SilverStripe specific configuration as CLI parameters and test-level includes (from r111055)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112422 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:20:45 +00:00
sminnee
5a20fbed64 #5870 Block web requests to silverstripe-cache directory via htaccess RedirectMatch rule or web.config hiddenSegments functionality if using IIS 7.x (from r110241)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112417 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:19:01 +00:00
sminnee
dfbd3e08f6 MINOR: repair installer for sqlite (from r109788)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:52 +00:00
sminnee
991ec354b1 ENHANCEMENT ErrorDocument in default .htaccess so Apache serves default 404 and 500 server error pages (from r108663)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:46 +00:00
sminnee
55d6682cd5 MINOR Changed unknown web server text (from r108571)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:39 +00:00
sminnee
7a2fce3458 MINOR Allow checking for a specific IIS version (parameter to InstallRequirements::isIIS()) (from r108570)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:00 +00:00
sminnee
83567dccdd MINOR Removed double up of similar logic in InstallRequirements (from r108569)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:17:53 +00:00
sminnee
f9d29bd9d6 MINOR Simplified discovery of webserver during install (from r108568)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:17:42 +00:00
sminnee
2a78807f4b MINOR Removed unncessary isset() check (from r108561)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:17:34 +00:00
sminnee
7b040c42ac MINOR Disallowing more potentially active file extensions in mysite/.htaccess (from r108208)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:51 +00:00
sminnee
a9c1f55bed BUGFIX: Fixed CLI installation. (from r108032)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:43 +00:00
sminnee
e44595bda9 BUGFIX: Don't set any dev servers by default, host-based dev-server selection is unreliable. (from r108031)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:37 +00:00
sminnee
b3193f2a7f BUGFIX: Don't allow reinstalling without first making the user manually delete mysite/_config.php (from r108030)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:31 +00:00
sminnee
7d4393910a BUGFIX: Don't allow direct access to PHP files in mysite module. (from r108029)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:18 +00:00
sminnee
c402bb9eef MINOR Tweaking of installer text to avoid misleading information about "exists" when there's actually an error (from r107366)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:09 +00:00
sminnee
8888693600 BUGFIX If database version can't be determined, just use the database adapter class (from r105726)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:15:14 +00:00
sminnee
49bf14177f BUGFIX Install now supports sending database version if available from the helper (from r105711)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112393 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:15:10 +00:00
sminnee
66dfdb97c7 BUGFIX ss2stat URL not generated correctly (has NULL values) (from r105705)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:15:04 +00:00
sminnee
820c49e8b4 MINOR Installer should not repeat "Could not determine your database version" twice in slightly varied words (from r105517)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:57 +00:00
sminnee
b0d11f1693 ENHANCEMENT Added variable for the server configuration file so the config-form can display it for the installation (from r105028)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:53 +00:00
sminnee
19050a38dc BUGFIX Installer now checks the database version AFTER it has determined a connection can be established, which some databases require first
BUGFIX Database version check failures are now a warning, so a user can install at their own risk (from r104793)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112389 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:48 +00:00
sminnee
30b46e866a BUGFIX Fixed installation problem where version error didn't show (from r104720)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:44 +00:00
sminnee
0c2f4d39e9 MINOR Installing screen now has a page title called "Installing SilverStripe..." instead of "PHP 5 is required" (from r104710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112387 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:39 +00:00
sminnee
d5e8eed587 MINOR Removed double returns in installer (redundant code) (from r104709)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:34 +00:00
sminnee
cf31776aa2 MINOR Renamed checkdatabase method to checkDatabase to be consistent (from r104708)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:28 +00:00
sminnee
26d3c34630 ENHANCEMENT Installer now supports requireDatabaseVersion() on each database configuration helper implementation, e.g. MySQLDatabaseConfigurationHelper. If it's not defined, the test is skipped. (from r104707)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:13:50 +00:00
sminnee
c13021e4ca MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:47 +00:00
sminnee
2c798ff57d BUGFIX Installer should check for DOMDocument (DOM/XML extension for PHP), as it's required to be there for sapphire to operate correctly (from r103471)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:45 +00:00
sminnee
bc60d451e5 BUGFIX #5326: Fix installation when using _ss_environment.php (from r102087)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:30 +00:00
sminnee
4a949635a3 API CHANGE: Removed default search controls; use MySQLFulltextSearchable::enable() instead. (from r101813)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:23 +00:00
sminnee
c63d9cc064 BUGFIX Fixed case where $_SERVER['SERVER_SIGNATURE'] was an empty string, use empty() instead of checking if it's set (which it is, but has an empty string) (from r101734)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:19 +00:00
sminnee
66b1ce5e12 BUGFIX Fixed InstallerRequirements::isApache() which didn't work if $_SERVER['SERVER_SIGNATURE'] is available for Apache (from r101733)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:14 +00:00
sminnee
b7de7c502c ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps (from r101661)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:09 +00:00
sminnee
408ddac289 ENHANCEMENT: refactored requirements section to hide successful tests (from r101382)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112222 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:27:56 +00:00
sminnee
432413132a BUGFIX Installer bug where apache_get_modules() doesn't exist (installing from IIS) (from r101357)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:27:51 +00:00
sminnee
bdb865ea27 MINOR Changed text "mod_rewrite enabled" to "URL rewriting support" which makes more sense as a requirement (from r101348)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:57 +00:00
sminnee
61d3293c2f MINOR Removed whitespace in writing of htaccess file for output (from r101344)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112219 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:52 +00:00
sminnee
174ac21ce1 ENHANCEMENT #5080 SilverStripe can now be installed successfully on servers that do not have any rewrite capability (from r101343)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112218 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:40 +00:00
sminnee
0cd20830fd MINOR Removed traces of "firstname" and "surname" from installer (these were removed in config-form in r101314) (from r101315)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112217 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:35 +00:00
sminnee
1af78e980d BUGFIX Fixed installer breaking if stats checkbox unchecked (from r101098)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112216 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:31 +00:00
sminnee
55c0e7e915 MINOR Added todo for exception handling done with default admin (from r101086)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112215 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:27 +00:00
sminnee
aba0caf624 MINOR Temporary fix for exception thrown in installer when existing admin account exists, temp fix just leaves existing admin account intact (from r101085)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112214 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:20 +00:00
sminnee
816945682f MINOR Fixed incorrect name "FileSystem" replacing with "Filesystem" (from r101084)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:16 +00:00
sminnee
77137e1bb2 MINOR Additional fixes for install.php (see r101063) (from r101067)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:11 +00:00
sminnee
c5dc242b94 MINOR Fixed install.php to accept "typed" database configuration (see r101054) (from r101063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:06 +00:00
sminnee
dd1af76763 MINOR Installer generated mysite/_config.php file now has consistent code formatting (from r100984)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112210 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:01 +00:00
sminnee
8654d465b6 MINOR Removed registered databases from installer, these are autodiscovered from sapphire/_register_database.php now (from r100903)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:36 +00:00
sminnee
51d4836bda MINOR Updated registered databases in installer from changes to DatabaseRegistry in r100898 (from r100899)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:30 +00:00
sminnee
3f34c41315 BUGFIX Installer now looks in DatabaseRegistry for adapter when checking database requirements (from r100894)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:12 +00:00
sminnee
21b75a3d6e MINOR Installer gets default locale from i18n::get_locale() before trying to autodiscover by USER_AGENT string (from r100877)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:07 +00:00
sminnee
b9bf36c35b MINOR Fixed improper quoting in locale setting (from r100839)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:39 +00:00
sminnee
24887b13a9 MINOR Code formatting (from r100802)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:35 +00:00
sminnee
9fc052fe58 MINOR: added sqlite to the installer (from r100800)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112202 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:31 +00:00
sminnee
7a3be4418e ENHANCEMENT you can now choose your site locale at install time (from r100769)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:26 +00:00
sminnee
454d58a04d MINOR phpDoc update for Page (from r100735)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:21 +00:00
sminnee
7f9d4872a7 MINOR Code formatting fixes for default Page pagetype (from r100734)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:17 +00:00
sminnee
03edb8b515 MINOR remove the sqlite databases from the installer list. (from r100697)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:12 +00:00
sminnee
9b1372a29a ENHANCEMENT show all database systems we support, along with messages if the user cannot use them. Also allow 3rd parties to register their own database classes to appear in this list. (from r100696)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112197 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:00 +00:00
sminnee
45adbbb8e8 BUGFIX Installer now checks for 5.1.0 PHP version at minimum. Anything less than 5.1.0 will probably have issues with SilverStripe (from r100660)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112196 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:49 +00:00
sminnee
b69d0a9539 MINOR Show "Unknown web server" if server couldn't be determined (from r100636)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:44 +00:00
sminnee
15d13b6f82 MINOR Fixed place where IIS was used instead of checking for 7 (from r100635)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:39 +00:00
sminnee
322be54599 MINOR Check for IIS/7 specifically, as IIS 6 has a completely different way of installing (from r100634)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:34 +00:00
sminnee
34fa1f06bf MINOR Removed ecommerce and payment from "make getallmodules" (from r100559)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112191 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:28 +00:00
sminnee
e3360ab241 MINOR Fixed character glitch in UPGRADING file (from r100558)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112190 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:19 +00:00
sminnee
0243a2a2e6 MINOR Fixed location to tutorials in INSTALL file which went to an empty page (from r100557)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:12 +00:00
sminnee
5a10c7afd5 MINOR Removed lighthttpd from INSTALL notes since this server isn't supported during installer process (more details on the server requirements wiki page) (from r100556)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112188 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:06 +00:00
sminnee
0cd01f3dd9 MINOR Updated INSTALL notes with minimum PHP version (from r100555)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112187 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:58 +00:00
sminnee
fbc6cd5db7 BUGFIX Webserver should be encoded properly when sending server stats to ss2stat during SS installation (from r100554)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:40 +00:00
sminnee
0d5b969a49 ENHANCEMENT IIS 7.x no longer throws a server error if the rewrite module isn't installed when first opening the SS installer - instead, the web.config file is written with rules during installation
MINOR Tidied up installer, removing unused methods and clearly defining the web server support (from r100553)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:35 +00:00
sminnee
216b934aeb MINOR Updated INSTALL notes (from r100388)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:22 +00:00
sminnee
c153aa6746 MINOR Made the database types clearer by setting the minimum version required alongside the name - e.g. "MySQL 4.1+" (from r100381)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:15 +00:00
sminnee
cf647f463e ENHANCEMENT #5024 Installer now checks that the user has entered a username and password correctly for the default admin, an additional button for re-checking requirements is now found at the bottom of the admin configuration section
ENHANCEMENT Error messages for database AND admin configuration are now in the same place at the top of the installer (from r99841)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:21:56 +00:00
sminnee
acbe3b9058 MINOR: Updated UPGRADING readme to reference dev/build rather than db/build (from r99742)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112181 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:21:50 +00:00
sminnee
08262a9b38 BUGFIX If SS_DATABASE_CLASS is set to a database that doesn't exist, don't break the installer but fallback to MySQL (from r99598)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:21:40 +00:00
sminnee
3cb0146e36 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:02:18 +00:00
sminnee
c91949e7fb MINOR Removed unused method in installer (from r99006)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:02:03 +00:00
sminnee
6a9193e01a ENHANCEMENT If the database type to install with doesn't allow creation of databases, allow for this case and inform the user they need to create it manually (from r99001)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:01:31 +00:00
sminnee
f61920afb1 MINOR Updated UPGRADING notes (#5063) (from r98910)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:59:43 +00:00
sminnee
de519f36ac MINOR Removed unnecessary check for conflicting classes Query and HTTPResponse in installer, these are now namespaced as SS_Query and SS_HTTPResponse (from r98896)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:58:52 +00:00
sminnee
ae4cf3b422 MINOR Removed unncessary ?> tag in generated _config.php file (from r98894)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:58:13 +00:00
sminnee
b58d4c5f7e BUGFIX Installer should generate MySQLDatabase::set_connection_charset('utf8') in the _config.php to allow for better encoding in MySQL (from r98893)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:57:56 +00:00
sminnee
22ed5dfd1d MINOR Removed unnecessary end tag which the original _config.php doesn't have anyway (from r98891)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:56:09 +00:00
sminnee
044b0f0f80 BUGFIX If mod_rewrite isn't enabled on Apache, a 500 server error won't be generated which prevents the installer from opening and telling you there's no rewrite support (from r98887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:53:34 +00:00
sminnee
4997c0a9bd MINOR Removed MySQL specific checking from the installer until we can figure out how to do it well across different databases. The only remaining MySQL specifics in the installer is the sending of the server information to ss2stats (from r98877)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:51:12 +00:00
sminnee
1a2f989c06 MINOR Removed check for MySQL function in the main PHP configuration - this is done separately by database helper classes (from r98875)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:50:56 +00:00
sminnee
2f452bfabb MINOR Reverted r98850 which broke the installer on Windows (from r98862)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:50:28 +00:00
sminnee
d2b772726c BUGFIX Installer does not require .htaccess file to be writable if using IIS 7 and 7.5. We assume any other server has some form of .htaccess file (from r98850)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:49:22 +00:00
sminnee
c4de1cb3be MINOR Renamed keys to database configuration results (from r98795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:48:46 +00:00
sminnee
6368a4fea0 MINOR Amendments to installer database configuration and small issue detecting database support in PHP (from r98794)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112102 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:48:17 +00:00
sminnee
73964a844f MINOR Removed warning that appears during installation steps (regression from recent changes) (from r98793)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112101 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:47:55 +00:00
sminnee
0c0fe50e49 MINOR Doc for database configuration helper (from r98789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112100 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:47:38 +00:00
sminnee
42f5002736 API CHANGE Installer now uses a database configuration helper class which isolates the logic of checking the database away from the installer, this interface can be used by other databases like MSSQL and PostgreSQL. The installer now looks for a specific file inside each database module, provided it's configured in install.php MySQL is provided by default, as it lives in sapphire (from r98786)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:47:16 +00:00
sminnee
7cec02c3f3 BUGFIX Fixed unlink of mysite/_config.php and truncate it instead - when re-creating the file it may not get write permissions on Windows (from r98783)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:44:34 +00:00
sminnee
3c8aba8ed4 BUGFIX Send the database in use (not just the MySQL version) to ss2stats in installer (from r98782)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:43:05 +00:00
sminnee
7363fe54a5 BUGFIX Fixed MySQL connection in installer not detecting incorrect credentials (from r98760)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:42:44 +00:00
sminnee
42144c288d BUGFIX Installer should cache the database connection so queries testing database creation can be made properly (from r98744)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112095 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:42:14 +00:00
sminnee
5663e264e1 MINOR: Several merges from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:42:08 +00:00
sminnee
e76df36179 BUGFIX: fixed double slash when installed in the root. PATCH via simon_w. #4733 (from r98038)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:33:55 +00:00
sminnee
bf5e862c6a BUGFIX Check for existance of IIS rewrite module as a value that exists instead of being "1" (from r98031)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:33:27 +00:00
sminnee
dd015ff76a ENHANCEMENT Removed extension specific RewriteCond from .htaccess, install.php and rewritetest.php to allow for broader range of dynamically handled extensions (e.g. generating GIF files through SilverStripe controllers). See #2958 (from r97791)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:32:36 +00:00
sminnee
51effb7e78 BUGFIX: Remove hacky mucking with chdir() and $_SERVER - they're no longer necessary (from r97732)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:32:07 +00:00
sminnee
e012b5a418 BUGFIX Explicitly set a default administrator in Installer->install() rather than assuming its credentials are set through Security::findAnAdministrator() (see #4271) (from r97479)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:29:22 +00:00
sminnee
e8bb141aaa BUGFIX #4791 Potential issue with creating files in SS installer on IIS - use the "b" mode when using fopen() to be more portable on platforms (from r96826)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:27:21 +00:00
sminnee
e013e7512b MINOR Convert crlf (Windows) line endings to lf (UNIX) for install.php (from r93895)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:26:57 +00:00
sminnee
eebff68f46 ENHANCEMENT Easier installation for IIS based configurations by providing the web.config file out of the box, an inaccessible file on Apache based web servers (from r93255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:22:49 +00:00
sminnee
9b340214fd MINOR Added location on where to download the MS URL rewrite module when installing on IIS (from r93244)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:21:41 +00:00
sminnee
62d6260fab BUGFIX Sometimes SERVER_SIGNATURE isn't populated in PHP, so fall back to using SERVER_SOFTWARE to detect the webserver during SS install (from r93113)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:20:13 +00:00
sminnee
3077816c25 ENHANCEMENT #4576 Detection of IIS and the IIS URL Rewrite Module during SS install (from r93110)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:19:24 +00:00
sminnee
44be8c39bc MINOR Fixed ambiguous statements about the database in installation, refer to MySQL specifically since that's what it's checking for (from r93107)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:17:17 +00:00
sminnee
95f1703979 ENHANCEMENT #4742 Set lower timeout for mysql_connect to avoid long timeouts when mysql_connect can't find a MySQL server locally during SS install, and only do certain MySQL checks if the server can be found, greatly improving install performance (from r93106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:16:27 +00:00
sminnee
be07c8ca3f MINOR Fixed grammar mistake in install (from r92304)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:13:54 +00:00
ischommer
317e179cb1 MINOR Added querystring option to Makefile (from r103746)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@103884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-03 01:32:42 +00:00
ischommer
429e2421c9 MINOR Temporarily added legacydatetimefields module to trunk until 2.4 is merged back
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@103678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-28 10:53:57 +00:00
ischommer
3053074464 MINOR Reverting back to a much more boring documentation link
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@100002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:34:32 +00:00
ischommer
5157a61f72 w00t
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@100001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:28:26 +00:00
ischommer
1f80831a30 2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@99999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:28:09 +00:00
ischommer
8230e7b7ac 3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@99998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:28:02 +00:00
wrossiter
1cb2814764 Reverted r97231
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@97326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-21 02:36:23 +00:00
fwink
882036e886 MINOR: Initial - still in prgress
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@97321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-21 02:10:09 +00:00
sharvey
28277e9eca MINOR Reverted r96950
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@96953 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-14 20:36:57 +00:00
apiening
c037177557 FEATURE: new SQLite3 database adapter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@96950 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-14 20:18:07 +00:00
sharvey
3b9fef20fd MINOR Removed jsparty from mergesources
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@93736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:05:13 +00:00
wrossiter
bc5208aef8 MINOR: fixed externals to point to public facing repo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@93621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 08:32:57 +00:00
ischommer
64faf6654a MINOR Removed checks for jsparty/ directory, which is no longer required
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@93615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 05:18:23 +00:00
ischommer
a0cedd3fb5 MINOR Partially reverted r92439, accidental commit to .htaccess
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 10:36:20 +00:00
ischommer
5832b464e7 API CHANGE Removed jsparty/ directory after merging in jsrewrite feature branch changes. The contained folders are now located in cms/thirdparty and sapphire/thirdparty?
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 04:12:42 +00:00
ischommer
0d0956b8be MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:54:02 +00:00
ischommer
4322aeb820 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92447 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:27:53 +00:00
ischommer
8a1a426fc6 MINOR: Updating mergeinfo to ignore mergebacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92446 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 00:54:49 +00:00
ischommer
ed7a77a38d MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92441 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 00:46:20 +00:00
ischommer
844acb217d MINOR: Updating mergeinfo to ignore mergebacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92439 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 00:42:47 +00:00
ischommer
4b3bc1996d MINOR Fixed merge errors and omissions from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 20:14:26 +00:00
ischommer
43ab9eaca5 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92256 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 20:00:40 +00:00
ischommer
a6a70237ed MINOR Changed silverstripe.com references to silverstripe.org (from r90887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:59:17 +00:00
ischommer
1dcca6ef3c MINOR Removed unnecessary mergeinfo from themes subfolders
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92253 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:56:09 +00:00
ischommer
60ff89dfbd BUGFIX Fixed $ escaping in passwords set by install.php in _config.php (#4676) (from r90883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92252 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:54:50 +00:00
ischommer
48fe08f2d0 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92251 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:53:31 +00:00
ischommer
2c15f4b61f MINOR Reverted accidental commits in r71146, r71147, r71148, r71149, r71150, r71151 - thought I was committing to another repository... (from r71152)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:51:49 +00:00
ischommer
6765f0ac06 MINOR Fixed comma where it should've been a dot (from r83449)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92249 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:46:05 +00:00
ischommer
27c046a2a0 BUGFIX #4356 Removed string checking of PHP version and replaced with version_compare() in SS installer (from r81646)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92248 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:45:12 +00:00
ischommer
9eebe737e2 BUGFIX #4171 hamish: Fixed assets/.htaccess for CGI environments. (from r79222)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92247 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:42:55 +00:00
ischommer
5959603955 Disable PHP in the assets directory, regardless of virtual-host config (from r74816)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92246 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:42:02 +00:00
ischommer
f3258df376 Added additional switch for a slight variation of the URL parsing code. (from r73224)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92245 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:41:49 +00:00
ischommer
ac4fe4b243 BUGFIX: Fixed rewriteless operation in IIS 5.1 (from r73166)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92244 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:41:35 +00:00
ischommer
92db28eaae BUGFIX: Fixed mod_rewrite-less operation in the root folder of a windows box (from r72995)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92243 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:41:12 +00:00
ischommer
be063f1285 MINOR: Use password field for password, dont require call by reference (from r72928)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92242 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:40:55 +00:00
ischommer
61f1d5dc2a BUGFIX: Get index.php filename rewriting working for windows (from r72504)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92241 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:39:57 +00:00
ischommer
c546a1877a ENHANCEMENT: Added index.php that will keep SilverStripe functioning even if the .htaccess doesn't work (svn diff) (from r72495)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92240 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:39:44 +00:00
ischommer
df8dc5f881 BUGFIX: Allow SilverStripe to work when asp_tags is on (from r72337)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92239 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:39:25 +00:00
ischommer
dcc2749ed6 MINOR: Changed change log to point to online change log. (from r71924)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92238 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:38:41 +00:00
ischommer
aa780a5e41 ... (from r71151)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92237 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:36:45 +00:00
ischommer
4e16f386c2 fixed label display for optionsetfields (from r71149)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92236 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:36:03 +00:00
ischommer
19c7e11c1e added mysite theme (from r71148)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:35:45 +00:00
ischommer
e361bea5a2 removed tutorial files (from r71147)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:35:27 +00:00
ischommer
3c07e8b53d ... (from r71146)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92233 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:35:12 +00:00
ischommer
db6ec11ce9 Added svn:ignore to assets/Uploads (from r70996)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:34:44 +00:00
ischommer
5bb0d9b138 Removed DirectorySlash update from installer's default htaccess as it breaks some installation targets (from r67085)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:34:02 +00:00
ischommer
37b79fc8a1 MINOR: Removed no-longer-used createHtAccessAlternative() (from r66916)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92230 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:33:24 +00:00
ischommer
b2154e8c91 MINOR: Fixed phpinstaller svn:externals (from r66907)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:31:26 +00:00
ischommer
9e1b6679fc ENHANCEMENT #3123: Use ajax for mod_rewrite testing (from r66906)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:31:13 +00:00
ischommer
c946d916d3 BUGFIX: Improved installer operation with PHP4 installed or no PHP installed.
API CHANGE: Reduced number of files needed for installer to work, and moved some into sapphire directory. (from r66896)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:25:37 +00:00
ischommer
89e5e6dc50 ENHANCEMENT #3126: Put site into dev mode for installation so you can see error messages. (from r66890)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:23:36 +00:00
ischommer
1c01f40a9d MINOR: Converted dos 2 unix (from r66887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:53 +00:00
ischommer
028ee1c529 ENHANCEMENT: Installer checks that Query and HTTPResponse classes don't exist before installing. (from r66886)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:34 +00:00
ischommer
286f4eb29f MINOR: Updating mergeinfo to ignore mergebacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:22 +00:00
ischommer
7d379183f5 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92222 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:07 +00:00
ischommer
d8cbb361b1 MINOR Added mergetracking info
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:18:06 +00:00
ischommer
660861635f MINOR Added 2.4 as mergesource target
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 03:09:46 +00:00
58 changed files with 595 additions and 2118 deletions

15
.cow.json Normal file
View File

@ -0,0 +1,15 @@
{
"github-slug": "silverstripe/silverstripe-installer",
"child-stability-inherit": true,
"dependency-constraint": "loose",
"vendors": [
"silverstripe"
],
"tests": [
"vendor/bin/phpunit vendor/silverstripe/framework/tests/php",
"vendor/bin/phpunit vendor/silverstripe/cms/tests/php"
],
"exclude": [
"silverstripe/recipe-plugin"
]
}

79
.cow/changelog.md.twig Normal file
View File

@ -0,0 +1,79 @@
# {{ version }}
## Overview
A full list of module versions included in CMS Recipe {{ version }} is provided below. We recommend referencing recipes in your dependencies, rather than individual modules, to simplify version tracking. See [Recipes](/getting_started/).
<details>
<summary>Included module versions</summary>
| Module | Version |
| ------ | ------- |
| silverstripe/admin | x.x.x |
| silverstripe/asset-admin | x.x.x |
| silverstripe/assets | x.x.x |
| silverstripe/campaign-admin | x.x.x |
| silverstripe/cms | x.x.x |
| silverstripe/config | x.x.x |
| silverstripe/errorpage | x.x.x |
| silverstripe/framework | x.x.x |
| silverstripe/graphql | x.x.x |
| silverstripe/login-forms | x.x.x |
| silverstripe/mimevalidator | x.x.x |
| silverstripe/reports | x.x.x |
| silverstripe/siteconfig | x.x.x |
| silverstripe/versioned | x.x.x |
| silverstripe/versioned-admin | x.x.x |
</details>
{% if version.stability == 'rc' %}
## Release Candidate
This version of Silverstripe CMS is a **release candidate** for an upcoming stable version, and should not be applied to production websites. We encourage developers to test this version in development / testing environments and [report any issues they encounter via GitHub](/contributing/issues_and_bugs/).
{% elseif version.stable %}
Upgrading to Recipe {{ version }} is recommended for all sites. This upgrade can be carried out by any development team familiar with Silverstripe.
## Security considerations
This release includes security fixes. Please see the release announcements for more detailed
descriptions of each. We highly encourage upgrading your project to include the latest security patches nonetheless.
We have provided a high-level severity rating of the vulnerabilities below based on the CVSS score, however please note this could vary based on the specifics of each project. You can [read the severity rating definitions in the Silverstripe CMS release process](/contributing/release_process/#severity-rating).
* [CVE-0000-0000 The Issue Title](https://www.silverstripe.org/download/security-releases/CVE-0000-0000) Severity: {# Critical/ High/ Medium/ Low #}
* [CVE-0000-0001 The Issue Title](https://www.silverstripe.org/download/security-releases/CVE-0000-0001) Severity: {# Critical/ High/ Medium/ Low #}
## New features
The [release announcement](#) includes the note worthy features, but be sure to review the change log for full detail.
{# other upgrade notes here #}
## Known issues
{#
* [Known issue](GitHub link)
#}
### Expected test failures
The following PHPUnit test failures are expected and do not represent functional issues:
{#
* List test failures here
#}
```
...
```
...
{% endif %}
{{ logs }}

25
.editorconfig Normal file
View File

@ -0,0 +1,25 @@
# For more information about the properties used in
# this file, please see the EditorConfig documentation:
# http://editorconfig.org/
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false
[*.{yml,json}]
# The indent size used in the `package.json` file cannot be changed
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
indent_size = 2
indent_style = space
[composer.json]
indent_size = 4

12
.env.example Normal file
View File

@ -0,0 +1,12 @@
# For a complete list of core environment variables see
# https://docs.silverstripe.org/en/4/getting_started/environment_management/#core-environment-variables
# DB credentials
SS_DATABASE_CLASS="MySQLDatabase"
SS_DATABASE_SERVER="localhost"
SS_DATABASE_USERNAME="<user>"
SS_DATABASE_PASSWORD="<password>"
SS_DATABASE_NAME="<database>"
# WARNING: in a live environment, change this to "live" instead of dev
SS_ENVIRONMENT_TYPE="dev"

11
.gitattributes vendored Normal file
View File

@ -0,0 +1,11 @@
.github export-ignore
.cow.json export-ignore
.cow export-ignore
.gitattributes export-ignore
.travis.yml export-ignore
behat.yml export-ignore
build.xml export-ignore
CONTRIBUTING.md export-ignore
LICENSE export-ignore
phpunit.xml.dist export-ignore
README.md

27
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,27 @@
name: CI
on:
push:
pull_request:
workflow_dispatch:
jobs:
ci:
name: CI
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with:
# installer contains a sample behat.yml file, though there are no behat tests to run
endtoend: false
# require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
# regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10
extra_jobs: |
- endtoend: true
endtoend_suite: admin
endtoend_config: vendor/silverstripe/admin/behat.yml
- endtoend: true
endtoend_suite: asset-admin
endtoend_config: vendor/silverstripe/asset-admin/behat.yml
- endtoend: true
endtoend_suite: cms
endtoend_config: vendor/silverstripe/cms/behat.yml

16
.github/workflows/dispatch-ci.yml vendored Normal file
View File

@ -0,0 +1,16 @@
name: Dispatch CI
on:
# At 4:00 PM and 5:00 PM
schedule:
- cron: '0 16,17 * * *'
jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1

17
.github/workflows/keepalive.yml vendored Normal file
View File

@ -0,0 +1,17 @@
name: Keepalive
on:
workflow_dispatch:
# The 8th of every month at 4:50pm UTC
schedule:
- cron: '50 16 8 * *'
jobs:
keepalive:
name: Keepalive
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Keepalive
uses: silverstripe/gha-keepalive@v1

8
.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/silverstripe-cache/
/.env
/vendor/
/themes/simple/
/_resources/
/public/_resources/
/.graphql-generated/
/public/_graphql/

View File

View File

@ -1,28 +1,2 @@
### SILVERSTRIPE START ### RewriteEngine On
<Files *.ss> RewriteRule ^(.*)$ public/$1
Order deny,allow
Deny from all
Allow from 127.0.0.1
</Files>
<Files web.config>
Order deny,allow
Deny from all
</Files>
ErrorDocument 404 /assets/error-404.html
ErrorDocument 500 /assets/error-500.html
<IfModule mod_alias.c>
RedirectMatch 403 /silverstripe-cache(/|$)
</IfModule>
<IfModule mod_rewrite.c>
SetEnv HTTP_MOD_REWRITE On
RewriteEngine On
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
</IfModule>
### SILVERSTRIPE END ###

View File

@ -1,8 +0,0 @@
# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
# Keeps track of all opensource branches of submodules
# that could be merged back to the current submodule paths.
trunk:
.: /open/phpinstaller/trunk
sapphire: /open/modules/sapphire/trunk
cms: /open/modules/cms/trunk
jsparty: /open/modules/jsparty/trunk

28
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,28 @@
# Contributing
Any open source product is only as good as the community behind it. You can participate by sharing code, ideas, or simply helping others. No matter what your skill level is, every contribution counts. See our [high level contribution overview](http://silverstripe.org/contributing-to-silverstripe) on silverstripe.org on how you can help out.
## Bugtracker ##
Bugs are tracked on [github.com](https://github.com/silverstripe/framework/issues).
Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues).
## Development and Contribution ##
For submitting patches, please read our [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code). We only accept pull requests on github.com.
## Links ##
* [Server Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements)
* [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
* [Forums](http://silverstripe.org/forums)
* [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
## Copyright
**IMPORTANT: By supplying code to the SilverStripe core team in patches, tickets and pull requests, you agree to assign copyright of that code to SilverStripe Limited, on the condition that SilverStripe Limited releases that code under the BSD license.**
We ask for this so that the ownership in the license is clear and unambiguous, and so that community involvement doesn't stop us from being able to continue supporting these projects. By releasing this code under a permissive license, this copyright assignment won't prevent you from using the code in any way you see fit.

View File

@ -1 +0,0 @@
For a full change log, please visit http://open.silverstripe.org/wiki/ChangeLog.

19
INSTALL
View File

@ -1,19 +0,0 @@
Thanks for downloading SilverStripe CMS.
Simply extract the archive to a folder in a web-accessible location and visit the folder
in your web browser (which in turn runs index.php).
This will lead you through a web-based installation process.
Server Requirements
* PHP 5.0.4+ (5.2+ is recommended)
* MySQL 4.1+ (other databases are supported - details here: http://doc.silverstripe.com/doku.php?id=server-requirements)
* Apache or IIS 7.x
* More information on server requirements here: http://doc.silverstripe.com/doku.php?id=server-requirements
General documentation, tutorials:
* Wiki: http://doc.silverstripe.com/
* Tutorials: http://doc.silverstripe.org/doku.php?id=tutorials
Forum
* http://www.silverstripe.com/silverstripe-forum/

View File

@ -1,4 +1,4 @@
Copyright (c) 2007-2008, SilverStripe Limited - www.silverstripe.com Copyright (c) 2007-2017, SilverStripe Limited - www.silverstripe.com
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

View File

@ -1,19 +0,0 @@
#
# This makefile is a secondary way of installing SilverStripe.
# It is used for things like continuous integration
#
# Most users should simply visit the site root in your web browser.
#
test:
$(MAKE) QUERYSTRING="$(QUERYSTRING)" -C sapphire test
getallmodules:
if [ -d auth_openid ]; then svn update auth_openid; else svn co http://svn.silverstripe.com/open/modules/auth_openid/trunk auth_openid; fi
if [ -d blog ]; then svn update blog; else svn co http://svn.silverstripe.com/open/modules/blog/trunk blog; fi
if [ -d cmsworkflow ]; then svn update cmsworkflow; else svn co http://svn.silverstripe.com/open/modules/cmsworkflow/trunk cmsworkflow; fi
if [ -d forum ]; then svn update forum; else svn co http://svn.silverstripe.com/open/modules/forum/trunk forum; fi
if [ -d genericdataadmin ]; then svn update genericdataadmin; else svn co http://svn.silverstripe.com/open/modules/genericdataadmin/trunk genericdataadmin; fi
if [ -d multiform ]; then svn update multiform; else svn co http://svn.silverstripe.com/open/modules/multiform/trunk multiform; fi
if [ -d subsites ]; then svn update subsites; else svn co http://svn.silverstripe.com/open/modules/subsites/trunk subsites; fi
if [ -d userforms ]; then svn update userforms; else svn co http://svn.silverstripe.com/open/modules/userforms/trunk userforms; fi

32
README.md Normal file
View File

@ -0,0 +1,32 @@
## Overview
[![CI](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml)
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.
## Installation ##
`composer create-project silverstripe/installer my-app`
See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information.
## Bugtracker ##
Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues),
[cms issues](https://github.com/silverstripe/silverstripe-cms/issues)).
Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/).
## Development and Contribution ##
If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/4/contributing/code/).
## Links ##
* [Changelogs](https://docs.silverstripe.org/en/4/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
* [Forums](http://silverstripe.org/forums)
* [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
* [License](./LICENSE)

View File

@ -1,20 +0,0 @@
Usually upgrading your SilverStripe installation just means overwriting files
and updating your database-schema.
- Backup your database
- Backup your webroot
- Download the new release and uncompress it to a temporary folder
- With these folders: cms, sapphire, googlesitemaps
- Delete your existing folders
- Extract and replace folders from your download (leave modules
and your custom directories alone)
- Moving your current folders (rather than installing on top) means
you can undo the installation, and ensures if the new release has no
longer contains some files, these files won't be left behind, which otherwise
could cause bugs.
- Visit http://your.silverstripe.site/dev/build (This adds new
fields/tables to the database, and empties your template cache)
- Check if any modules (e.g. blog or forum) in your installation are compatible
and need to be upgraded as well
- Check if you need to adapt your code to changed APIs, see
http://doc.silverstripe.com/doku.php?id=upgrading

26
app/_config/assets.yml Normal file
View File

@ -0,0 +1,26 @@
# SilverStripe 4.4 changes the way files are resolved. `silverstripe-assets` resolves files using a variety of formats
# by default. When starting a brand new project on SilverStripe 4.4 or greater, those extra formats are not needed and
# will slowdown file resolution requests a bit. This config removes those redundant formats.
---
Name: project-assetsflysystem
After: '#assetsflysystem'
---
SilverStripe\Core\Injector\Injector:
# Define public resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.public:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
- '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
VersionedStage: Live
# Define protected resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.protected:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
VersionedStage: Stage

9
app/_config/email.yml Normal file
View File

@ -0,0 +1,9 @@
# See https://docs.silverstripe.org/en/4/developer_guides/email/ for additional information about setting up email
---
Name: project-emailconfig
After:
- '#emailconfig'
---
SilverStripe\Core\Injector\Injector:
Swift_Transport:
class: Swift_SendmailTransport

8
app/_config/theme.yml Executable file
View File

@ -0,0 +1,8 @@
---
Name: mytheme
---
SilverStripe\View\SSViewer:
themes:
- '$public'
- 'simple'
- '$default'

View File

@ -1,37 +0,0 @@
#
# Whitelist appropriate assets files.
# Note that you will need to maintain this whitelist yourself if you modify File::$allowed_extensions
#
# If you are not using Apache then you can ignore this file.
# If you are using IIS then you should look at assets/web.config instead.
#
# To add an extension to the list, you need to put another string of the form "ext|" on the
# FilesMatch line, inside the parentheses.
#
# For example, to add *.exe files to list of downloadable assets, change this line:
#
# <FilesMatch "\.(html|htm|xhtml...
#
# To this:
#
# <FilesMatch "\.(exe|html|htm|xhtml...
#
# Once you do this, visitors will be able to download *.exe files that are uploaded to the assets
# directory.
#
# For compatibility reasons, we include uppercase versions of allowed extensions, as Apache 1.3
# does not support regular expression case insensitive matches using PCRE style.
#
Deny from all
<FilesMatch "\.(html|HTML|htm|HTM|xhtml|XHTML|js|JS|css|CSS|bmp|BMP|png|PNG|gif|GIF|jpg|JPG|jpeg|JPEG|ico|ICO|pcx|PCX|tif|TIF|tiff|TIFF|au|AU|mid|MID|midi|MIDI|mpa|MPA|mp3|MP3|ogg|OGG|m4a|M4A|ra|RA|wma|WMA|wav|WAV|cda|CDA|avi|AVI|mpg|MPG|mpeg|MPEG|asf|ASF|wmv|WMV|m4v|M4V|mov|MOV|mkv|MKV|mp4|MP4|swf|SWF|flv|FLV|ram|RAM|rm|RM|doc|DOC|docx|DOCX|txt|TXT|rtf|RTF|xls|XLS|xlsx|XLSX|pages|PAGES|ppt|PPT|pptx|PPTX|pps|PPS|csv|CSV|cab|CAB|arj|ARJ|tar|TAR|zip|ZIP|zipx|ZIPX|sit|SIT|sitx|SITX|gz|GZ|tgz|TGZ|bz2|BZ2|ace|ACE|arc|ARC|pkg|PKG|dmg|DMG|hqx|HQX|jar|JAR|xml|XML|pdf|PDF)$">
Allow from all
</FilesMatch>
# We disable PHP via several methods
# Replace the handler with the default plaintext handler
AddHandler default-handler php phtml php3 php4 php5 inc
<IfModule mod_php5.c>
# Turn the PHP engine off
php_flag engine off
</IfModule>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

21
behat.yml Normal file
View File

@ -0,0 +1,21 @@
# Note: Currently chrome latest is recommended
# Behat test setup requires an `.env` with `SS_BASE_URL` defined, as well
# as each of the following commands to initiate a test run:
# ========================================================================= #
# composer require silverstripe/recipe-testing ^1
# vendor/bin/behat-ss @<module>
# ========================================================================= #
default:
suites: []
extensions:
SilverStripe\BehatExtension\MinkExtension:
default_session: facebook_web_driver
javascript_session: facebook_web_driver
facebook_web_driver:
browser: chrome
wd_host: "http://127.0.0.1:9515" #chromedriver port
browser_name: chrome
SilverStripe\BehatExtension\Extension:
bootstrap_file: vendor/silverstripe/cms/tests/behat/serve-bootstrap.php
screenshot_path: '%paths.base%/artifacts/screenshots'
retry_seconds: 4 # default is 2

55
build.xml Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Phing build tooling for SilverStripe releases (see phing.info).
Install through "pear channel-discover pear.phing.info && pear install phing/phing".
Most tooling is placed in a separate module, install with "composer require silverstripe/buildtools".
It is safe to remove this file for normal website operation.
-->
<project name="silverstripe-installer" default="help" phingVersion="2.4.5">
<import file="buildtools/build.xml" optional="true" />
<property name="basedir" value="." override="true" />
<target name="help">
<phingcall target="buildtools.help" />
</target>
<target name="phpunit"
description="Runs unit tests as defined through phpunix.xml. Requires the 'phpunit' binary.">
<if>
<available file="${basedir}/vendor/bin/phpunit" />
<then>
<property name="phpunit_bin" value="vendor/bin/phpunit" />
</then>
<else>
<property name="phpunit_bin" value="phpunit" />
</else>
</if>
<exec command="${phpunit_bin}" checkreturn="true" passthru="true" />
</target>
<target name="behat" if="basedir"
description="Runs behaviour tests through Behat, on the 'framework' and 'cms' modules (if available). Requires phpunit, composer and behat.">
<if>
<available file="${basedir}/framework/" type="dir" />
<then>
<echo msg="Testing 'framework' module" />
<exec command="vendor/bin/behat --ansi @framework" checkreturn="true" passthru="true" />
</then>
</if>
<if>
<available file="${basedir}/cms/" type="dir" />
<then>
<echo msg="Testing 'cms' module" />
<exec command="vendor/bin/behat --ansi @cms" checkreturn="true" passthru="true" />
</then>
</if>
</target>
</project>

37
composer.json Normal file
View File

@ -0,0 +1,37 @@
{
"name": "silverstripe/installer",
"type": "silverstripe-recipe",
"description": "The SilverStripe Framework Installer",
"require": {
"php": "^7.4 || ^8.0",
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-cms": "4.x-dev",
"silverstripe-themes/simple": "~3.2.0",
"silverstripe/login-forms": "4.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
},
"extra": {
"project-files": [
"app/_config/*",
".env.example",
".graphql-generated/*"
],
"public-files": [
"assets/*",
"favicon.ico"
],
"resources-dir": "_resources"
},
"config": {
"process-timeout": 600,
"allow-plugins": {
"composer/installers": true,
"silverstripe/recipe-plugin": true,
"silverstripe/vendor-plugin": true
}
},
"prefer-stable": true,
"minimum-stability": "dev"
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

View File

@ -1,63 +0,0 @@
<?php
/************************************************************************************
************************************************************************************
** **
** If you can read this text in your browser then you don't have PHP installed. **
** Please install PHP 5.0 or higher, preferably PHP 5.2. **
** **
************************************************************************************
************************************************************************************/
/**
* This script bolts on top of SilverStripe/Sapphire to allow access without the use of .htaccess
* rewriting rules.
*/
// This is the URL of the script that everything must be viewed with.
define('BASE_SCRIPT_URL','index.php/');
$ruLen = strlen($_SERVER['REQUEST_URI']);
$snLen = strlen($_SERVER['SCRIPT_NAME']);
$isIIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false);
// IIS will populate server variables using one of these two ways
if($isIIS) {
if($_SERVER['REQUEST_URI'] == $_SERVER['SCRIPT_NAME']) {
$url = "";
} else if($ruLen > $snLen && substr($_SERVER['REQUEST_URI'],0,$snLen+1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
$url = substr($_SERVER['REQUEST_URI'],$snLen+1);
$url = strtok($url, '?');
} else {
$url = $_SERVER['REQUEST_URI'];
if($url[0] == '/') $url = substr($url,1);
$url = strtok($url, '?');
}
// Apache will populate the server variables this way
} else {
if($ruLen > $snLen && substr($_SERVER['REQUEST_URI'],0,$snLen+1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
$url = substr($_SERVER['REQUEST_URI'],$snLen+1);
$url = strtok($url, '?');
} else {
$url = "";
}
}
$_GET['url'] = $_REQUEST['url'] = $url;
$fileName = dirname($_SERVER['SCRIPT_FILENAME']) . '/' . $url;
/**
* This code is a very simple wrapper for sending files
* Very quickly pass through references to files
*/
if($url && file_exists($fileName)) {
$fileURL = (dirname($_SERVER['SCRIPT_NAME'])=='/'?'':dirname($_SERVER['SCRIPT_NAME'])) . '/' . $url;
header($_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently');
header("Location: $fileURL");
die();
}
require_once('sapphire/main.php');

View File

@ -1,1292 +0,0 @@
<?php
/************************************************************************************
************************************************************************************
** **
** If you can read this text in your browser then you don't have PHP installed. **
** Please install PHP 5.0 or higher, preferably PHP 5.2. **
** **
************************************************************************************
************************************************************************************/
/**
* SilverStripe CMS Installer
* This installer doesn't use any of the fancy Sapphire stuff in case it's unsupported.
* It's also PHP4 syntax compatable
*/
// speed up mysql_connect timeout if the server can't be found
ini_set('mysql.connect_timeout', 5);
ini_set('max_execution_time', 0);
error_reporting(E_ALL ^ E_NOTICE);
session_start();
$majorVersion = strtok(phpversion(),'.');
if($majorVersion < 5) {
header("HTTP/1.1 500 Server Error");
echo str_replace('$PHPVersion', phpversion(), file_get_contents("sapphire/dev/install/php5-required.html"));
die();
}
// Include environment files
$usingEnv = false;
$envFileExists = false;
$envFiles = array('_ss_environment.php', '../_ss_environment.php', '../../_ss_environment.php');
foreach($envFiles as $envFile) {
if(@file_exists($envFile)) {
include_once($envFile);
$envFileExists = true;
$usingEnv = true;
break;
}
}
if($envFileExists) {
if(!empty($_REQUEST['useEnv'])) {
$usingEnv = true;
} else {
$usingEnv = false;
}
}
include_once('sapphire/core/Object.php');
include_once('sapphire/core/i18n.php');
include_once('sapphire/dev/install/DatabaseConfigurationHelper.php');
include_once('sapphire/dev/install/DatabaseAdapterRegistry.php');
// Set default locale, but try and sniff from the user agent
$locales = i18n::$common_locales;
$defaultLocale = i18n::get_locale();
if(isset($_SERVER['HTTP_USER_AGENT'])) {
foreach($locales as $code => $details) {
$bits = explode('_', $code);
if(preg_match("/{$bits[0]}.{$bits[1]}/", $_SERVER['HTTP_USER_AGENT'])) {
$defaultLocale = $code;
break;
}
}
}
// Discover which databases are available
DatabaseAdapterRegistry::autodiscover();
// Determine which external database modules are USABLE
foreach(DatabaseAdapterRegistry::get_adapters() as $class => $details) {
$databaseClasses[$class] = $details;
if(file_exists($details['helperPath'])) {
$databaseClasses[$class]['hasModule'] = true;
include_once($details['helperPath']);
} else {
$databaseClasses[$class]['hasModule'] = false;
}
}
// Load database config
if(isset($_REQUEST['db'])) {
if(isset($_REQUEST['db']['type'])) $type = $_REQUEST['db']['type'];
else $type = $_REQUEST['db']['type'] = defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase';
// Disabled inputs don't submit anything - we need to use the environment (except the database name)
if($usingEnv) {
$_REQUEST['db'][$type] = $databaseConfig = array(
"type" => defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : $type,
"server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : "localhost",
"username" => defined('SS_DATABASE_USERNAME') ? SS_DATABASE_USERNAME : "root",
"password" => defined('SS_DATABASE_PASSWORD') ? SS_DATABASE_PASSWORD : "",
"database" => $_REQUEST['db'][$type]['database'],
);
} else {
// Normal behaviour without the environment
$databaseConfig = $_REQUEST['db'][$type];
$databaseConfig['type'] = $type;
}
} else {
$type = $_REQUEST['db']['type'] = defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase';
$_REQUEST['db'][$type] = $databaseConfig = array(
"type" => $type,
"server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : "localhost",
"username" => defined('SS_DATABASE_USERNAME') ? SS_DATABASE_USERNAME : "root",
"password" => defined('SS_DATABASE_PASSWORD') ? SS_DATABASE_PASSWORD : "",
"database" => isset($_SERVER['argv'][2]) ? $_SERVER['argv'][2] : "SS_mysite",
);
}
if(isset($_REQUEST['admin'])) {
// Disabled inputs don't submit anything - we need to use the environment (except the database name)
if($usingEnv) {
$_REQUEST['admin'] = $adminConfig = array(
'username' => defined('SS_DEFAULT_ADMIN_USERNAME') ? SS_DEFAULT_ADMIN_USERNAME : 'admin',
'password' => defined('SS_DEFAULT_ADMIN_PASSWORD') ? SS_DEFAULT_ADMIN_PASSWORD : '',
);
} else {
$adminConfig = $_REQUEST['admin'];
}
} else {
$_REQUEST['admin'] = $adminConfig = array(
'username' => defined('SS_DEFAULT_ADMIN_USERNAME') ? SS_DEFAULT_ADMIN_USERNAME : 'admin',
'password' => defined('SS_DEFAULT_ADMIN_PASSWORD') ? SS_DEFAULT_ADMIN_PASSWORD : '',
);
}
$alreadyInstalled = false;
if(file_exists('mysite/_config.php')) {
// Find the $database variable in the relevant config file without having to execute the config file
if(preg_match("/\\\$database\s*=\s*[^\n\r]+[\n\r]/", file_get_contents("mysite/_config.php"), $parts)) {
eval($parts[0]);
if($database) $alreadyInstalled = true;
// Assume that if $databaseConfig is defined in mysite/_config.php, then a non-environment-based installation has
// already gone ahead
} else if(preg_match("/\\\$databaseConfig\s*=\s*[^\n\r]+[\n\r]/", file_get_contents("mysite/_config.php"), $parts)) {
$alreadyInstalled = true;
}
}
if(file_exists('sapphire/silverstripe_version')) {
$sapphireVersionFile = file_get_contents('sapphire/silverstripe_version');
if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
$silverstripe_version = "trunk";
} else {
preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches);
$silverstripe_version = $matches[1];
}
} else {
$silverstripe_version = "unknown";
}
// Check requirements
$req = new InstallRequirements();
$req->check();
$webserverConfigFile = '';
if($req->isIIS()) {
$webserverConfigFile = 'web.config';
} else {
$webserverConfigFile = '.htaccess';
}
if($req->hasErrors()) {
$hasErrorOtherThanDatabase = true;
}
if($databaseConfig) {
$dbReq = new InstallRequirements();
$dbReq->checkDatabase($databaseConfig);
}
if($adminConfig) {
$adminReq = new InstallRequirements();
$adminReq->checkAdminConfig($adminConfig);
}
if(isset($_REQUEST['go']) && !$req->hasErrors() && !$dbReq->hasErrors() && $adminConfig['username'] && $adminConfig['password']) {
// Confirm before reinstalling
if($alreadyInstalled) {
include('sapphire/dev/install/config-form.html');
} else {
$inst = new Installer();
if($_REQUEST) $inst->install($_REQUEST);
else $inst->install(array(
'db' => $databaseConfig,
'admin' => $adminConfig,
));
}
// Show the config form
} else {
include('sapphire/dev/install/config-form.html');
}
/**
* This class checks requirements
* Each of the requireXXX functions takes an argument which gives a user description of the test.
* It's an array of 3 parts:
* $description[0] - The test catetgory
* $description[1] - The test title
* $description[2] - The test error to show, if it goes wrong
*/
class InstallRequirements {
var $errors, $warnings, $tests;
/**
* Check the database configuration. These are done one after another
* starting with checking the database function exists in PHP, and
* continuing onto more difficult checks like database permissions.
*/
function checkDatabase($databaseConfig) {
if($this->requireDatabaseFunctions(
$databaseConfig,
array(
"Database Configuration",
"Database support",
"Database support in PHP",
$this->getDatabaseTypeNice($databaseConfig['type'])
)
)) {
if($this->requireDatabaseServer(
$databaseConfig,
array(
"Database Configuration",
"Database server",
$databaseConfig['type'] == 'SQLiteDatabase' ? "I couldn't write to path '$databaseConfig[path]'" : "I couldn't find a database server on '$databaseConfig[server]'",
$databaseConfig['type'] == 'SQLiteDatabase' ? $databaseConfig['path'] : $databaseConfig['server']
)
)) {
if($this->requireDatabaseConnection(
$databaseConfig,
array(
"Database Configuration",
"Database access credentials correct",
"That username/password doesn't work"
)
)) {
if($this->requireDatabaseVersion(
$databaseConfig,
array(
"Database Configuration",
"Database server meets required version",
'',
'Version ' . $this->getDatabaseConfigurationHelper($databaseConfig['type'])->getDatabaseVersion($databaseConfig)
)
)) {
$this->requireDatabaseOrCreatePermissions(
$databaseConfig,
array(
"Database Configuration",
"Can I access/create the database",
"I can't create new databases and the database '$databaseConfig[database]' doesn't exist"
)
);
}
}
}
}
}
function checkAdminConfig($adminConfig) {
if(!$adminConfig['username']) {
$this->error(array('', 'Please enter a username!'));
}
if(!$adminConfig['password']) {
$this->error(array('', 'Please enter a password!'));
}
}
/**
* Check if the web server is IIS.
* @return boolean
*/
function isIIS($version = 7) {
if(strpos($this->findWebserver(), 'IIS/' . $version) !== false) {
return true;
} else {
return false;
}
}
function isApache() {
if(strpos($this->findWebserver(), 'Apache') !== false) {
return true;
} else {
return false;
}
}
/**
* Find the webserver software running on the PHP host.
* @return string|boolean Server software or boolean FALSE
*/
function findWebserver() {
// Try finding from SERVER_SIGNATURE or SERVER_SOFTWARE
$webserver = @$_SERVER['SERVER_SIGNATURE'];
if(!$webserver) $webserver = @$_SERVER['SERVER_SOFTWARE'];
if($webserver) return strip_tags(trim($webserver));
else return false;
}
/**
* Check everything except the database
*/
function check() {
$this->errors = null;
$isApache = $this->isApache();
$isIIS = $this->isIIS(7);
$webserver = $this->findWebserver();
$this->requirePHPVersion('5.2.0', '5.1.0', array("PHP Configuration", "PHP5 installed", null, "PHP version " . phpversion()));
// Check that we can identify the root folder successfully
$this->requireFile('sapphire/dev/install/config-form.html', array("File permissions",
"Does the webserver know where files are stored?",
"The webserver isn't letting me identify where files are stored.",
$this->getBaseDir()
));
$this->requireModule('mysite', array("File permissions", "mysite/ directory exists?"));
$this->requireModule('sapphire', array("File permissions", "sapphire/ directory exists?"));
$this->requireModule('cms', array("File permissions", "cms/ directory exists?"));
if($isApache) {
$this->requireWriteable('.htaccess', array("File permissions", "Is the .htaccess file writeable?", null));
} elseif($isIIS) {
$this->requireWriteable('web.config', array("File permissions", "Is the web.config file writeable?", null));
}
$this->requireWriteable('mysite/_config.php', array("File permissions", "Is the mysite/_config.php file writeable?", null));
$this->requireWriteable('assets', array("File permissions", "Is the assets/ directory writeable?", null));
$tempFolder = $this->getTempFolder();
$this->requireTempFolder(array('File permissions', 'Is a temporary directory available?', null, $tempFolder));
if($tempFolder) {
// in addition to the temp folder being available, check it is writable
$this->requireWriteable($tempFolder, array("File permissions", sprintf("Is the temporary directory writeable?", $tempFolder), null), true);
}
$this->isRunningWebServer(array("Webserver Configuration", "Server software", "Unknown", $webserver));
if($isApache) {
$this->requireApacheRewriteModule('mod_rewrite', array("Webserver Configuration", "URL rewriting support", "You need mod_rewrite to use friendly URLs with SilverStripe, but it is not enabled."));
} elseif($isIIS) {
$this->requireIISRewriteModule('IIS_UrlRewriteModule', array("Webserver Configuration", "URL rewriting support", "You need to enable the IIS URL Rewrite Module to use friendly URLs with SilverStripe, but it is not installed or enabled. Download it for IIS 7 from http://www.iis.net/expand/URLRewrite"));
} else {
$this->warning(array("Webserver Configuration", "URL rewriting support", "I can't tell whether any rewriting module is running. You may need to configure a rewriting rule yourself."));
}
$this->requireServerVariables(array('SCRIPT_NAME','HTTP_HOST','SCRIPT_FILENAME'), array("Webserver config", "Recognised webserver", "You seem to be using an unsupported webserver. The server variables SCRIPT_NAME, HTTP_HOST, SCRIPT_FILENAME need to be set."));
// Check for GD support
if(!$this->requireFunction("imagecreatetruecolor", array("PHP Configuration", "GD2 support", "PHP must have GD version 2."))) {
$this->requireFunction("imagecreate", array("PHP Configuration", "GD2 support", "GD support for PHP not included."));
}
// Check for XML support
$this->requireFunction('xml_set_object', array("PHP Configuration", "XML support", "XML support not included in PHP."));
$this->requireClass('DOMDocument', array("PHP Configuration", "DOM/XML support", "DOM/XML support not included in PHP."));
// Check for token_get_all
$this->requireFunction('token_get_all', array("PHP Configuration", "PHP Tokenizer", "PHP tokenizer support not included in PHP."));
// Check for session support
$this->requireFunction('session_start', array('PHP Configuration', 'Session support', 'Session support not included in PHP.'));
// Check for iconv support
$this->requireFunction('iconv', array('PHP Configuration', 'iconv support', 'iconv support not included in PHP.'));
// Check for hash support
$this->requireFunction('hash', array('PHP Configuration', 'hash support', 'hash support not included in PHP.'));
if(version_compare(PHP_VERSION, '5.3.0', '>=')) {
$this->requireDateTimezone(array('PHP Configuration', 'date.timezone set and valid', 'date.timezone option in php.ini must be set in PHP 5.3.0+', ini_get('date.timezone')));
}
$this->suggestPHPSetting('asp_tags', array(''), array('PHP Configuration', 'asp_tags option turned off', 'This should be turned off as it can cause issues with SilverStripe'));
$this->suggestPHPSetting('magic_quotes_gpc', array(''), array('PHP Configuration', 'magic_quotes_gpc option turned off', 'This should be turned off, as it can cause issues with cookies. More specifically, unserializing data stored in cookies.'));
// Check memory allocation
$this->requireMemory(32*1024*1024, 64*1024*1024, array("PHP Configuration", "Memory allocated (PHP config option 'memory_limit')", "SilverStripe needs a minimum of 32M allocated to PHP, but recommends 64M.", ini_get("memory_limit")));
return $this->errors;
}
function suggestPHPSetting($settingName, $settingValues, $testDetails) {
$this->testing($testDetails);
$val = ini_get($settingName);
if(!in_array($val, $settingValues) && $val != $settingValues) {
$testDetails[2] = "$settingName is set to '$val' in php.ini. $testDetails[2]";
$this->warning($testDetails);
}
}
function requireDateTimezone($testDetails) {
$this->testing($testDetails);
$result = ini_get('date.timezone') && in_array(ini_get('date.timezone'), timezone_identifiers_list());
if(!$result) {
$this->error($testDetails);
}
}
function requireMemory($min, $recommended, $testDetails) {
$_SESSION['forcemem'] = false;
$mem = $this->getPHPMemory();
if($mem < (64 * 1024 * 1024)) {
ini_set('memory_limit', '64M');
$mem = $this->getPHPMemory();
$testDetails[3] = ini_get("memory_limit");
}
$this->testing($testDetails);
if($mem < $min && $mem > 0) {
$testDetails[2] .= " You only have " . ini_get("memory_limit") . " allocated";
$this->error($testDetails);
} else if($mem < $recommended && $mem > 0) {
$testDetails[2] .= " You only have " . ini_get("memory_limit") . " allocated";
$this->warning($testDetails);
} elseif($mem == 0) {
$testDetails[2] .= " We can't determine how much memory you have allocated. Install only if you're sure you've allocated at least 20 MB.";
$this->warning($testDetails);
}
}
function getPHPMemory() {
$memString = ini_get("memory_limit");
switch(strtolower(substr($memString,-1))) {
case "k":
return round(substr($memString,0,-1)*1024);
case "m":
return round(substr($memString,0,-1)*1024*1024);
case "g":
return round(substr($memString,0,-1)*1024*1024*1024);
default:
return round($memString);
}
}
function listErrors() {
if($this->errors) {
echo "<p>The following problems are preventing me from installing SilverStripe CMS:</p>\n\n";
foreach($this->errors as $error) {
echo "<li>" . htmlentities(implode(", ", $error)) . "</li>\n";
}
}
}
function showTable($section = null) {
if($section) {
$tests = $this->tests[$section];
$id = strtolower(str_replace(' ', '_', $section));
echo "<table id=\"{$id}_results\" class=\"testResults\" width=\"100%\">";
foreach($tests as $test => $result) {
echo "<tr class=\"$result[0]\"><td>$test</td><td>" . nl2br(htmlentities($result[1])) . "</td></tr>";
}
echo "</table>";
} else {
foreach($this->tests as $section => $tests) {
$failedRequirements = 0;
$warningRequirements = 0;
$output = "";
foreach($tests as $test => $result) {
if(isset($result['0'])) {
switch($result['0']) {
case 'error':
$failedRequirements++;
break;
case 'warning':
$warningRequirements++;
break;
}
}
$output .= "<tr class=\"$result[0]\"><td>$test</td><td>" . nl2br(htmlentities($result[1])) . "</td></tr>";
}
$className = "good";
$text = "All Requirements Pass";
$pluralWarnings = ($warningRequirements == 1) ? 'Warning' : 'Warnings';
if($failedRequirements > 0) {
$className = "error";
$pluralWarnings = ($warningRequirements == 1) ? 'Warning' : 'Warnings';
$text = $failedRequirements . ' Failed and '. $warningRequirements . ' '. $pluralWarnings;
}
else if($warningRequirements > 0) {
$className = "warning";
$text = "All Requirements Pass but ". $warningRequirements . ' '. $pluralWarnings;
}
echo "<h5 class='requirement $className'><em class='inlineBarText'>$section</em> <a href='#'>See All Requirements</a> <span>$text</span></h5>";
echo "<table class=\"testResults\">";
echo $output;
echo "</table>";
}
}
}
function requireFunction($funcName, $testDetails) {
$this->testing($testDetails);
if(!function_exists($funcName)) $this->error($testDetails);
else return true;
}
function requireClass($className, $testDetails) {
$this->testing($testDetails);
if(!class_exists($className)) $this->error($testDetails);
else return false;
}
/**
* Require that the given class doesn't exist
*/
function requireNoClasses($classNames, $testDetails) {
$this->testing($testDetails);
$badClasses = array();
foreach($classNames as $className) {
if(class_exists($className)) $badClasses[] = $className;
}
if($badClasses) {
$testDetails[2] .= ". The following classes are at fault: " . implode(', ', $badClasses);
$this->error($testDetails);
}
else return true;
}
function requirePHPVersion($recommendedVersion, $requiredVersion, $testDetails) {
$this->testing($testDetails);
$installedVersion = phpversion();
if(version_compare($installedVersion, $requiredVersion, '<')) {
$testDetails[2] = "SilverStripe requires PHP version $requiredVersion or later.\n
PHP version $installedVersion is currently installed.\n
While SilverStripe requires at least PHP version $requiredVersion, upgrading to $recommendedVersion or later is recommended.\n
If you are installing SilverStripe on a shared web server, please ask your web hosting provider to upgrade PHP for you.";
$this->error($testDetails);
return;
}
if(version_compare($installedVersion, $recommendedVersion, '<')) {
$testDetails[2] = "PHP version $installedVersion is currently installed.\n
Upgrading to at least PHP version $recommendedVersion is recommended.\n
SilverStripe should run, but you may run into issues. Future releases may require a later version of PHP.\n";
$this->warning($testDetails);
return;
}
return true;
}
/**
* The same as {@link requireFile()} but does additional checks
* to ensure the module directory is intact.
*/
function requireModule($dirname, $testDetails) {
$this->testing($testDetails);
$path = $this->getBaseDir() . $dirname;
if(!file_exists($path)) {
$testDetails[2] .= " Directory '$path' not found. Please make sure you have uploaded the SilverStripe files to your webserver correctly.";
$this->error($testDetails);
} elseif(!file_exists($path . '/_config.php') && $dirname != 'mysite') {
$testDetails[2] .= " Directory '$path' exists, but is missing files. Please make sure you have uploaded the SilverStripe files to your webserver correctly.";
$this->error($testDetails);
}
}
function requireFile($filename, $testDetails) {
$this->testing($testDetails);
$filename = $this->getBaseDir() . $filename;
if(!file_exists($filename)) {
$testDetails[2] .= " (file '$filename' not found)";
$this->error($testDetails);
}
}
function requireWriteable($filename, $testDetails, $absolute = false) {
$this->testing($testDetails);
if($absolute) {
$filename = str_replace('/', DIRECTORY_SEPARATOR, $filename);
} else {
$filename = $this->getBaseDir() . str_replace('/', DIRECTORY_SEPARATOR, $filename);
}
if(file_exists($filename)) $isWriteable = is_writeable($filename);
else $isWriteable = is_writeable(dirname($filename));
if(!$isWriteable) {
if(function_exists('posix_getgroups')) {
$userID = posix_geteuid();
$user = posix_getpwuid($userID);
$currentOwnerID = fileowner(file_exists($filename) ? $filename : dirname($filename) );
$currentOwner = posix_getpwuid($currentOwnerID);
$testDetails[2] .= "User '$user[name]' needs to be able to write to this file:\n$filename\n\nThe file is currently owned by '$currentOwner[name]'. ";
if($user['name'] == $currentOwner['name']) {
$testDetails[2] .= "We recommend that you make the file writeable.";
} else {
$groups = posix_getgroups();
$groupList = array();
foreach($groups as $group) {
$groupInfo = posix_getgrgid($group);
if(in_array($currentOwner['name'], $groupInfo['members'])) $groupList[] = $groupInfo['name'];
}
if($groupList) {
$testDetails[2] .= " We recommend that you make the file group-writeable and change the group to one of these groups:\n - ". implode("\n - ", $groupList)
. "\n\nFor example:\nchmod g+w $filename\nchgrp " . $groupList[0] . " $filename";
} else {
$testDetails[2] .= " There is no user-group that contains both the web-server user and the owner of this file. Change the ownership of the file, create a new group, or temporarily make the file writeable by everyone during the install process.";
}
}
} else {
$testDetails[2] .= "The webserver user needs to be able to write to this file:\n$filename";
}
$this->error($testDetails);
}
}
function getTempFolder() {
if(file_exists($this->getBaseDir() . 'silverstripe-cache')) {
$sysTmp = $this->getBaseDir();
} elseif(function_exists('sys_get_temp_dir')) {
$sysTmp = sys_get_temp_dir();
} elseif(isset($_ENV['TMP'])) {
$sysTmp = $_ENV['TMP'];
} else {
@$tmpFile = tempnam('adfadsfdas', '');
@unlink($tmpFile);
$sysTmp = dirname($tmpFile);
}
$worked = true;
$ssTmp = $sysTmp . DIRECTORY_SEPARATOR . 'silverstripe-cache';
if(!@file_exists($ssTmp)) {
@$worked = mkdir($ssTmp);
if(!$worked) {
$ssTmp = dirname($_SERVER['SCRIPT_FILENAME']) . DIRECTORY_SEPARATOR . 'silverstripe-cache';
$worked = true;
if(!@file_exists($ssTmp)) {
@$worked = mkdir($ssTmp);
}
}
}
if($worked) return $ssTmp;
else return false;
}
function requireTempFolder($testDetails) {
$this->testing($testDetails);
$tempFolder = $this->getTempFolder();
if(!$tempFolder) {
$testDetails[2] = "Permission problem gaining access to a temp directory. " .
"Please create a folder named silverstripe-cache in the base directory " .
"of the installation and ensure it has the adequate permissions";
$this->error($testDetails);
}
}
function requireApacheModule($moduleName, $testDetails) {
$this->testing($testDetails);
if(!in_array($moduleName, apache_get_modules())) {
$this->error($testDetails);
return false;
} else {
return true;
}
}
function testApacheRewriteExists($moduleName = 'mod_rewrite') {
if(function_exists('apache_get_modules') && in_array($moduleName, apache_get_modules())) {
return true;
} elseif(isset($_SERVER['HTTP_MOD_REWRITE']) && $_SERVER['HTTP_MOD_REWRITE'] == 'On') {
return true;
} else {
return false;
}
}
function testIISRewriteModuleExists($moduleName = 'IIS_UrlRewriteModule') {
if(isset($_SERVER[$moduleName]) && $_SERVER[$moduleName]) {
return true;
} else {
return false;
}
}
function requireApacheRewriteModule($moduleName, $testDetails) {
$this->testing($testDetails);
if($this->testApacheRewriteExists()) {
return true;
} else {
$this->warning($testDetails);
return false;
}
}
/**
* Determines if the web server has any rewriting capability.
* @return boolean
*/
function hasRewritingCapability() {
return ($this->testApacheRewriteExists() || $this->testIISRewriteModuleExists());
}
function requireIISRewriteModule($moduleName, $testDetails) {
$this->testing($testDetails);
if($this->testIISRewriteModuleExists()) {
return true;
} else {
$this->warning($testDetails);
return false;
}
}
function getDatabaseTypeNice($databaseClass) {
return substr($databaseClass, 0, -8);
}
/**
* Get an instance of a helper class for the specific database.
* @param string $databaseClass e.g. MySQLDatabase or MSSQLDatabase
*/
function getDatabaseConfigurationHelper($databaseClass) {
$adapters = DatabaseAdapterRegistry::get_adapters();
if(isset($adapters[$databaseClass])) {
$helperPath = $adapters[$databaseClass]['helperPath'];
$class = str_replace('.php', '', basename($helperPath));
}
return (class_exists($class)) ? new $class() : new MySQLDatabaseConfigurationHelper();
}
function requireDatabaseFunctions($databaseConfig, $testDetails) {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseFunctions($databaseConfig);
if($result) {
return true;
} else {
$this->error($testDetails);
return false;
}
}
function requireDatabaseConnection($databaseConfig, $testDetails) {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseConnection($databaseConfig);
if($result['success']) {
return true;
} else {
$testDetails[2] .= ": " . $result['error'];
$this->error($testDetails);
return false;
}
}
function requireDatabaseVersion($databaseConfig, $testDetails) {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
if(method_exists($helper, 'requireDatabaseVersion')) {
$result = $helper->requireDatabaseVersion($databaseConfig);
if($result['success']) {
return true;
} else {
$testDetails[2] .= $result['error'];
$this->warning($testDetails);
return false;
}
}
// Skipped test because this database has no required version
return true;
}
function requireDatabaseServer($databaseConfig, $testDetails) {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseServer($databaseConfig);
if($result['success']) {
return true;
} else {
$testDetails[2] .= ": " . $result['error'];
$this->error($testDetails);
return false;
}
}
function requireDatabaseOrCreatePermissions($databaseConfig, $testDetails) {
$this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseOrCreatePermissions($databaseConfig);
if($result['success']) {
if($result['alreadyExists']) $testDetails[3] = "Database $databaseConfig[database]";
else $testDetails[3] = "Able to create a new database";
$this->testing($testDetails);
return true;
} else {
if(!@$result['cannotCreate']) {
$testDetails[2] .= ". Please create the database manually.";
} else {
$testDetails[2] .= " (user '$databaseConfig[username]' doesn't have CREATE DATABASE permissions.)";
}
$this->error($testDetails);
return false;
}
}
function requireServerVariables($varNames, $errorMessage) {
//$this->testing($testDetails);
foreach($varNames as $varName) {
if(!$_SERVER[$varName]) $missing[] = '$_SERVER[' . $varName . ']';
}
if(!isset($missing)) {
return true;
} else {
$testDetails[2] .= " (the following PHP variables are missing: " . implode(", ", $missing) . ")";
$this->error($testDetails);
}
}
function isRunningWebServer($testDetails) {
$this->testing($testDetails);
if($testDetails[3]) {
return true;
} else {
$this->warning($testDetails);
return false;
}
}
// Must be PHP4 compatible
var $baseDir;
function getBaseDir() {
// Cache the value so that when the installer mucks with SCRIPT_FILENAME half way through, this method
// still returns the correct value.
if(!$this->baseDir) $this->baseDir = realpath(dirname($_SERVER['SCRIPT_FILENAME'])) . DIRECTORY_SEPARATOR;
return $this->baseDir;
}
function testing($testDetails) {
if(!$testDetails) return;
$section = $testDetails[0];
$test = $testDetails[1];
$message = "OK";
if(isset($testDetails[3])) $message .= " ($testDetails[3])";
$this->tests[$section][$test] = array("good", $message);
}
function error($testDetails) {
$section = $testDetails[0];
$test = $testDetails[1];
$this->tests[$section][$test] = array("error", $testDetails[2]);
$this->errors[] = $testDetails;
}
function warning($testDetails) {
$section = $testDetails[0];
$test = $testDetails[1];
$this->tests[$section][$test] = array("warning", $testDetails[2]);
$this->warnings[] = $testDetails;
}
function hasErrors() {
return sizeof($this->errors);
}
function hasWarnings() {
return sizeof($this->warnings);
}
}
class Installer extends InstallRequirements {
function __construct() {
// Cache the baseDir value
$this->getBaseDir();
}
function install($config) {
?>
<html>
<head>
<title>Installing SilverStripe...</title>
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css" />
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css" />
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css" />
<link rel="stylesheet" type="text/css" href="sapphire/dev/install/install.css" />
<script src="sapphire/thirdparty/jquery/jquery.js"></script>
</head>
<body>
<div id="BgContainer">
<div id="Container">
<div id="Header">
<h1>SilverStripe CMS Installation</h1>
</div>
<div id="Navigation">&nbsp;</div>
<div class="clear"><!-- --></div>
<div id="Layout">
<div class="typography">
<h1>Installing SilverStripe...</h1>
<p>I am now running through the installation steps (this should take about 30 seconds)</p>
<p>If you receive a fatal error, refresh this page to continue the installation</p>
<ul>
<?php
$webserver = $this->findWebserver();
$isIIS = $this->isIIS();
$isApache = $this->isApache();
flush();
if(isset($config['stats'])) {
if(file_exists('sapphire/silverstripe_version')) {
$sapphireVersionFile = file_get_contents('sapphire/silverstripe_version');
if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
$silverstripe_version = "trunk";
} else {
preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches);
$silverstripe_version = $matches[1];
}
} else {
$silverstripe_version = "unknown";
}
$phpVersion = urlencode(phpversion());
$encWebserver = urlencode($webserver);
$dbType = $config['db']['type'];
// Try to determine the database version from the helper
$databaseVersion = $config['db']['type'];
$helper = $this->getDatabaseConfigurationHelper($dbType);
if($helper && method_exists($helper, 'getDatabaseVersion')) {
$databaseVersion = urlencode($dbType . ': ' . $helper->getDatabaseVersion($config['db'][$dbType]));
}
$url = "http://ss2stat.silverstripe.com/Installation/add?SilverStripe=$silverstripe_version&PHP=$phpVersion&Database=$databaseVersion&WebServer=$encWebserver";
if(isset($_SESSION['StatsID']) && $_SESSION['StatsID']) {
$url .= '&ID=' . $_SESSION['StatsID'];
}
@$_SESSION['StatsID'] = file_get_contents($url);
}
if(file_exists('mysite/_config.php')) {
// Truncate the contents of _config instead of deleting it - we can't re-create it because Windows handles permissions slightly
// differently to UNIX based filesystems - it takes the permissions from the parent directory instead of retaining them
$fh = fopen('mysite/_config.php', 'wb');
fclose($fh);
}
$theme = isset($_POST['template']) ? $_POST['template'] : 'blackcandy';
$locale = isset($_POST['locale']) ? $_POST['locale'] : 'en_US';
$type = $config['db']['type'];
$dbConfig = $config['db'][$type];
if(!$dbConfig) {
echo "<p style=\"color: red\">Bad config submitted</p><pre>";
print_r($config);
echo "</pre>";
die();
}
// Write the config file
global $usingEnv;
if($usingEnv) {
$this->statusMessage("Setting up 'mysite/_config.php' for use with _ss_environment.php...");
$this->writeToFile("mysite/_config.php", <<<PHP
<?php
global \$project;
\$project = 'mysite';
global \$database;
\$database = '{$dbConfig['database']}';
require_once('conf/ConfigureFromEnv.php');
MySQLDatabase::set_connection_charset('utf8');
// This line set's the current theme. More themes can be
// downloaded from http://www.silverstripe.org/themes/
SSViewer::set_theme('$theme');
// Set the site locale
i18n::set_locale('$locale');
// enable nested URLs for this site (e.g. page/sub-page/)
SiteTree::enable_nested_urls();
PHP
);
} else {
$this->statusMessage("Setting up 'mysite/_config.php'...");
$escapedPassword = addslashes($dbConfig['password']);
$this->writeToFile("mysite/_config.php", <<<PHP
<?php
global \$project;
\$project = 'mysite';
global \$databaseConfig;
\$databaseConfig = array(
"type" => '{$type}',
"server" => '{$dbConfig['server']}',
"username" => '{$dbConfig['username']}',
"password" => '{$escapedPassword}',
"database" => '{$dbConfig['database']}',
"path" => '{$dbConfig['path']}',
);
MySQLDatabase::set_connection_charset('utf8');
// This line set's the current theme. More themes can be
// downloaded from http://www.silverstripe.org/themes/
SSViewer::set_theme('$theme');
// Set the site locale
i18n::set_locale('$locale');
// enable nested URLs for this site (e.g. page/sub-page/)
SiteTree::enable_nested_urls();
PHP
);
}
// Write the appropriate web server configuration file for rewriting support
if($this->hasRewritingCapability()) {
if($isApache) {
$this->statusMessage("Setting up '.htaccess' file...");
$this->createHtaccess();
} elseif($isIIS) {
$this->statusMessage("Setting up 'web.config' file...");
$this->createWebConfig();
}
}
// Load the sapphire runtime
$_SERVER['SCRIPT_FILENAME'] = dirname(realpath($_SERVER['SCRIPT_FILENAME'])) . '/sapphire/main.php';
chdir('sapphire');
// Rebuild the manifest
$_GET['flush'] = true;
// Show errors as if you're in development mode
$_SESSION['isDev'] = 1;
require_once('core/Core.php');
$this->statusMessage("Building database schema...");
// Build database
$con = new Controller();
$con->pushCurrent();
global $databaseConfig;
DB::connect($databaseConfig);
$dbAdmin = new DatabaseAdmin();
$dbAdmin->init();
$dbAdmin->doBuild(true);
// Create default administrator user and group in database
// (not using Security::setDefaultAdmin())
$adminMember = Security::findAnAdministrator();
$adminMember->Email = $config['admin']['username'];
$adminMember->Password = $config['admin']['password'];
$adminMember->PasswordEncryption = Security::get_password_encryption_algorithm();
// @todo Exception thrown if database with admin already exists with same Email
try {
$adminMember->write();
} catch(Exception $e) {
}
// Syncing filesystem (so /assets/Uploads is available instantly, see ticket #2266)
Filesystem::sync();
$_SESSION['username'] = $config['admin']['username'];
$_SESSION['password'] = $config['admin']['password'];
if(!$this->errors) {
if(isset($_SERVER['HTTP_HOST']) && $this->hasRewritingCapability()) {
$this->statusMessage("Checking that friendly URLs work...");
$this->checkRewrite();
} else {
echo <<<HTML
<li>SilverStripe successfully installed; I am now redirecting you to your SilverStripe site...</li>
<script>
setTimeout(function() {
window.location = "index.php/home/successfullyinstalled?flush=1";
}, 2000);
</script>
<noscript>
<li><a href="index.php/home/successfullyinstalled?flush=1">Click here to access your site.</li>
</noscript>
HTML;
}
}
return $this->errors;
}
function writeToFile($filename, $content) {
$base = $this->getBaseDir();
$this->statusMessage("Setting up $base$filename");
if((@$fh = fopen($base . $filename, 'wb')) && fwrite($fh, $content) && fclose($fh)) {
return true;
} else {
$this->error("Couldn't write to file $base$filename");
}
}
function createHtaccess() {
$start = "### SILVERSTRIPE START ###\n";
$end = "\n### SILVERSTRIPE END ###";
$base = dirname($_SERVER['SCRIPT_NAME']);
if(defined('DIRECTORY_SEPARATOR')) $base = str_replace(DIRECTORY_SEPARATOR, '/', $base);
else $base = str_replace("\\", '/', $base);
if($base != '.') $baseClause = "RewriteBase $base\n";
else $baseClause = "";
$rewrite = <<<TEXT
<Files *.ss>
Order deny,allow
Deny from all
Allow from 127.0.0.1
</Files>
<Files web.config>
Order deny,allow
Deny from all
</Files>
ErrorDocument 404 /assets/error-404.html
ErrorDocument 500 /assets/error-500.html
<IfModule mod_alias.c>
RedirectMatch 403 /silverstripe-cache(/|$)
</IfModule>
<IfModule mod_rewrite.c>
SetEnv HTTP_MOD_REWRITE On
RewriteEngine On
$baseClause
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
</IfModule>
TEXT;
if(file_exists('.htaccess')) {
$htaccess = file_get_contents('.htaccess');
if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) {
$htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n";
}
if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) {
$start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n";
$end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###'));
}
}
$this->writeToFile('.htaccess', $start . $rewrite . $end);
}
/**
* Writes basic configuration to the web.config for IIS
* so that rewriting capability can be use.
*/
function createWebConfig() {
$content = <<<TEXT
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<security>
<requestFiltering>
<hiddenSegments applyToWebDAV="false">
<add segment="silverstripe-cache" />
</hiddenSegments>
</requestFiltering>
</security>
<rewrite>
<rules>
<rule name="SilverStripe Clean URLs" stopProcessing="true">
<match url="^(.*)$" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
</conditions>
<action type="Rewrite" url="sapphire/main.php?url={R:1}" appendQueryString="true" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>
TEXT;
$this->writeToFile('web.config', $content);
}
function checkRewrite() {
echo <<<HTML
<li id="ModRewriteResult">Testing...</li>
<script>
if(typeof $ == 'undefined') {
document.getElemenyById('ModeRewriteResult').innerHTML = "I can't run jQuery ajax to set rewriting; I will redirect you to the homepage to see if everything is working.";
setTimeout(function() {
window.location = "home/successfullyinstalled?flush=1";
}, 10000);
} else {
$.ajax({
method: 'get',
url: 'InstallerTest/testrewrite',
complete: function(response) {
if(response.responseText == 'OK') {
$('#ModRewriteResult').html("Friendly URLs set up successfully; I am now redirecting you to your SilverStripe site...")
setTimeout(function() {
window.location = "home/successfullyinstalled?flush=1";
}, 2000);
} else {
$('#ModRewriteResult').html("Friendly URLs are not working. This is most likely because a rewrite module isn't configured "
+ "correctly on your site. You may need to get your web host or server administrator to do this for you: "
+ "<ul>"
+ "<li><strong>mod_rewrite</strong> or other rewrite module is enabled on your web server</li>"
+ "<li><strong>AllowOverride All</strong> is set for the directory where SilverStripe is installed</li>"
+ "</ul>");
}
}
});
}
</script>
<noscript>
<li><a href="home/successfullyinstalled?flush=1">Click here</a> to check friendly URLs are working. If you get a 404 then something is wrong.</li>
</noscript>
HTML;
}
function var_export_array_nokeys($array) {
$retval = "array(\n";
foreach($array as $item) {
$retval .= "\t'";
$retval .= trim($item);
$retval .= "',\n";
}
$retval .= ")";
return $retval;
}
/**
* Show an installation status message.
*/
function statusMessage($msg) {
echo "<li>$msg</li>\n";
flush();
}
}

View File

@ -1,3 +0,0 @@
<FilesMatch "\.(php|php3|php4|php5|phtml|inc)$">
Deny from all
</FilesMatch>

View File

@ -1,18 +0,0 @@
<?php
global $project;
$project = 'mysite';
global $database;
$database = '';
require_once('conf/ConfigureFromEnv.php');
MySQLDatabase::set_connection_charset('utf8');
// This line set's the current theme. More themes can be
// downloaded from http://www.silverstripe.org/themes/
SSViewer::set_theme('blackcandy');
// enable nested URLs for this site (e.g. page/sub-page/)
SiteTree::enable_nested_urls();

View File

@ -1,41 +0,0 @@
<?php
class Page extends SiteTree {
public static $db = array(
);
public static $has_one = array(
);
}
class Page_Controller extends ContentController {
/**
* An array of actions that can be accessed via a request. Each array element should be an action name, and the
* permissions or conditions required to allow the user to access it.
*
* <code>
* array (
* 'action', // anyone can access this action
* 'action' => true, // same as above
* 'action' => 'ADMIN', // you must have ADMIN permissions to access this action
* 'action' => '->checkAction' // you can only access this action if $this->checkAction() returns true
* );
* </code>
*
* @var array
*/
public static $allowed_actions = array (
);
public function init() {
parent::init();
// Note: you should use SS template require tags inside your templates
// instead of putting Requirements calls here. However these are
// included so that our older themes still work
Requirements::themedCSS('layout');
Requirements::themedCSS('typography');
Requirements::themedCSS('form');
}
}

26
phpcs.xml.dist Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<ruleset name="SS3">
<description>Coding standard for SilverStripe 4.x</description>
<file>app</file>
<!-- Don't sniff third party libraries -->
<exclude-pattern>*/vendor/*</exclude-pattern>
<exclude-pattern>*/thirdparty/*</exclude-pattern>
<!-- Show progress and output sniff names on violation, and add colours -->
<arg value="sp"/>
<arg name="colors"/>
<!-- Use PSR-2 as a base standard -->
<rule ref="PSR2">
<!-- Allow classes to not declare a namespace -->
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
<!-- Allow underscores in class names -->
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
<!-- Allow non camel cased method names -->
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
</rule>
</ruleset>

View File

@ -1,43 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
PHPUnit configuration for SilverStripe
Requires PHPUnit 9+
Usage: Usage:
- "phpunit": Runs all tests in all folders - "vendor/bin/phpunit": Runs all tests in all folders
- "phpunit sapphire/tests/": Run all tests of the sapphire module - "vendor/bin/phpunit vendor/silverstripe/framework/tests/": Run all tests of the framework module
- "phpunit sapphire/tests/filesystem": Run all filesystem tests within the sapphire module - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem": Run all filesystem tests within framework
- "phpunit sapphire/tests/filesystem/FolderTest.php": Run a single test - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem/FolderTest.php": Run a single test
- "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug) - "vendor/bin/phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace
<dash> with "-", requires xdebug or phpdbg)
Further information: More information:
- http://www.phpunit.de/manual/current/en/textui.html for more commandline options. - http://www.phpunit.de/manual/current/en/textui.html
- http://github.com/chillu/silverstripe-doc-restructuring/blob/master/master/cms/docs/en/howto/phpunit-configuration.md - http://doc.silverstripe.org/framework/en/topics/testing/#configuration
for more information on configuration and execution options.
- sapphire/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool. It is safe to remove this file for normal website operation.
--> -->
<phpunit <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
bootstrap="/sapphire/tests/bootstrap.php" <testsuites>
colors="true" <testsuite name="Default">
> <directory>app/tests</directory>
<testsuite name="Default"> <directory>vendor/silverstripe/cms/tests/php</directory>
<directory>./</directory> <directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite> </testsuite>
<filter> <!-- Framework ORM tests are split up to run in parallel -->
<blacklist> <testsuite name="framework-core">
<directory suffix=".php">sapphire/dev/</directory> <directory>vendor/silverstripe/framework/tests/php</directory>
<directory suffix=".php">sapphire/thirdparty/</directory> <exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
<directory suffix=".php">cms/thirdparty/</directory> </testsuite>
<file>sapphire/tests/PhpSyntaxTest.php</file> <testsuite name="framework-orm">
</blacklist> <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
</filter> </testsuite>
<listeners> <!-- other core components -->
<listener class="SS_TestListener" file="sapphire/dev/TestListener.php"> <testsuite name="core">
</listener> <directory>vendor/silverstripe/assets/tests/php/</directory>
</listeners> <directory>vendor/silverstripe/versioned/tests/php/</directory>
</testsuite>
<groups>
<exclude>
<group>sanitychecks</group>
</exclude>
</groups>
<!-- admin components -->
<testsuite name="admin">
<directory>vendor/silverstripe/admin/tests/php/</directory>
<directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/config/tests/</directory>
<directory>vendor/silverstripe/errorpage/tests/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/login-forms/tests/php/</directory>
<directory>vendor/silverstripe/mimevalidator/tests/</directory>
<directory>vendor/silverstripe/reports/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
</testsuite>
</testsuites>
</phpunit> </phpunit>

0
public/_graphql/.gitkeep Normal file
View File

4
public/assets/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
/**/*
!.gitignore
!.htaccess
!web.config

35
public/assets/.htaccess Normal file
View File

@ -0,0 +1,35 @@
#
# Whitelist appropriate assets files.
# This file is automatically generated via File.allowed_extensions configuration
# See AssetAdapter::renderTemplate() for reference.
#
# We disable PHP via several methods
# Replace the handler with the default plaintext handler
AddHandler default-handler php phtml php3 php4 php5 inc
<IfModule mod_php5.c>
# Turn the PHP engine off
php_flag engine off
</IfModule>
<IfModule mod_rewrite.c>
<IfModule mod_env.c>
SetEnv HTTP_MOD_REWRITE On
</IfModule>
RewriteEngine On
# Allow error pages
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule error[^\\/]*\.html$ - [L]
# Block invalid file extensions
RewriteCond %{REQUEST_URI} !^[^.]*\.(?i:css|js|ace|arc|arj|asf|au|avi|bmp|bz2|cab|cda|csv|dmg|doc|docx|dotx|flv|gif|gpx|gz|hqx|ico|jpeg|jpg|kml|m4a|m4v|mid|midi|mkv|mov|mp3|mp4|mpa|mpeg|mpg|ogg|ogv|pages|pcx|pdf|png|pps|ppt|pptx|potx|ra|ram|rm|rtf|sit|sitx|tar|tgz|tif|tiff|txt|wav|webm|wma|wmv|xls|xlsx|xltx|zip|zipx)$
RewriteRule .* - [F]
# Non-existent files passed to requesthandler
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* ../index.php [QSA]
</IfModule>

View File

@ -57,6 +57,8 @@ directory.
<add fileExtension=".mov" allowed="true" /> <add fileExtension=".mov" allowed="true" />
<add fileExtension=".mkv" allowed="true" /> <add fileExtension=".mkv" allowed="true" />
<add fileExtension=".mp4" allowed="true" /> <add fileExtension=".mp4" allowed="true" />
<add fileExtension=".ogv" allowed="true" />
<add fileExtension=".webm" allowed="true" />
<add fileExtension=".swf" allowed="true" /> <add fileExtension=".swf" allowed="true" />
<add fileExtension=".flv" allowed="true" /> <add fileExtension=".flv" allowed="true" />
<add fileExtension=".ram" allowed="true" /> <add fileExtension=".ram" allowed="true" />
@ -90,6 +92,8 @@ directory.
<add fileExtension=".jar" allowed="true" /> <add fileExtension=".jar" allowed="true" />
<add fileExtension=".xml" allowed="true" /> <add fileExtension=".xml" allowed="true" />
<add fileExtension=".pdf" allowed="true" /> <add fileExtension=".pdf" allowed="true" />
<add fileExtension=".gpx" allowed="true" />
<add fileExtension=".kml" allowed="true" />
</fileExtensions> </fileExtensions>
</requestFiltering> </requestFiltering>
</security> </security>

BIN
public/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -1,14 +0,0 @@
/**
* This support file is used to style the WYSIWYG editor in the CMS
*/
@import "typography.css";
body.mceContentBody {
min-height: 200px;
font-size: 62.5%;
}
body.mceContentBody a.broken {
background-color: #FF7B71;
border: 1px red solid;
}

View File

@ -1,64 +0,0 @@
/* GENERIC FORM STYLING */
#Content form {
width:378px;
}
#Content form fieldset {
border:0;
padding:12px;
}
#Content .message {
color:red;
background:#ddd;
border:1px solid #ccc;
padding:5px;
margin:5px;
}
#Content span.message {
width: 300px;
}
#Content form div {
margin-top:10px;
width:100%;
}
#Content form label {
font-size:1.1em;
color:#333;
}
#Content form label.left {
float:left;
width:12em;
}
#Content form label.FormHeading {
font-size:1.3em;
color:#ff7200;
font-weight:bold;
}
#Content form input.text,
#Content form textarea,
#Content form select {
width:200px;
color:#000;
background:#f8f8f8;
border:1px solid #aaa;
padding:3px;
}
#Content form input.numeric {
width:20px;
background:#f0f0f0;
border:1px solid #aaa;
padding:3px;
color:#000;
margin-right:4px;
}
#Content form input.year {
width:35px;
}
#Content form p.Actions {
text-align:right;
padding:0 22px 15px 0;
}
#Content form p.Actions input {
padding:2px;
}

View File

@ -1,287 +0,0 @@
/* Global Resetting */
html{
width: 100%;
height: 100%;
background:url(../images/body_bg.gif) repeat;
}
body {
width: 100%;
height: 100%;
font-size: 62.5%;
/* reset font-sizes to 1em == 10px */
}
* {
font-size: 1em;
/* reset font-sizes to 1em == 10px */
padding: 0;
margin: 0;
font-family:Verdana,Helvetica,sans-serif;
list-style:none;
}
a img{
border:0;
}
.clear{
clear:both;
}
/* Layout CSS */
#Main {
margin:20px auto;
width:900px;
}
#Header {
background:url(../images/blueback.gif) bottom left repeat-x;
border-left:1px solid #ccc;
border-right:1px solid #ccc;
clear:left;
}
#Header h1 {
color:#fff;
font-size:1.5em;
line-height:4.5em;
padding-left:20px;
}
#Menu1 {
padding:10px 50px 0;
}
#Menu1 li {
float:left;
margin-left:2px;
background:url(../images/menu1_right.gif) no-repeat right top;
}
#Menu1 li.current,
#Menu1 li.section {
background:url(../images/menu1_right_on.gif) no-repeat right top;
}
#Menu1 li a {
display:block;
color:#fff;
font-weight:bold;
font-size:1.1em;
text-decoration:none;
padding:5px 15px;
background:url(../images/menu1_left.gif) no-repeat left top;
}
#Menu1 li a:hover {
color:#d2ebff;
}
#Menu1 li.current a,
#Menu1 li.section a {
background:url(../images/menu1_left_on.gif) no-repeat left top;
color:#d2ebff;
}
#ContentContainer {
background:#f5f5f5 url(../images/ss_watermark.gif) bottom left no-repeat;
padding-top:20px;
padding-bottom:20px;
overflow: auto;
}
#Banner {
text-align: center;
}
#Menu2 {
margin-left: 20px;
width: 17em;
float:left;
background:#f0f0f0;
border:1px solid #ddd;
padding:10px 10px 10px 10px;
}
#Menu2 li {
padding-left:15px;
background:url(../images/menu2_arrow.gif) no-repeat left center;
}
#Menu2 a {
color:#333;
font-weight:bold;
font-size:1.1em;
line-height:1.6em;
text-decoration:none;
}
#Menu2 a:hover {
text-decoration:underline;
}
#Menu2 li.current a,
#Menu2 li.section a {
color:#0083C8;
}
#Content {
float: left;
margin: 0px 20px;
width:70%;
}
div.breadcrumbs {
margin-bottom:10px;
font-size:1em;
color:#666;
}
div.breadcrumbs a {
text-decoration:none;
}
#Footer {
background:#015581;
clear:both;
text-align:right;
padding-right:20px;
border:1px solid #ccc;
border-top:0;
}
#Footer span {
color:#ccc;
font-size:1.1em;
line-height:2em;
font-weight:bold;
padding-left:20px;
background:url(../images/ss_logo.gif) no-repeat;
}
#Footer a {
color:#fff;
}
#Footer a:hover {
text-decoration:none;
}
/* The rest of this file is for the second tutorial */
#NewsList,
#StaffList {
background:#f0f0f0;
border:1px dotted #ccc;
padding:10px;
}
#NewsList li,
#StaffList li {
margin: 0;
list-style-type: none;
}
#NewsList li.newsDateTitle span {
color:#666;
line-height:2em;
}
#NewsList li.newsDateTitle a {
font-size:1.3em;
font-weight:bold;
color:#0083C8;
text-decoration:none;
padding-left:20px;
background:url(../images/treeicons/news-file.gif) no-repeat left center;
}
#NewsList li.newsDateTitle a:hover {
border-bottom:1px dotted #0083C8;
}
#NewsList li.newsSummary {
margin-bottom:20px;
}
#NewsList li.newsSummary span {
font-size:1.1em;
line-height:1.5em;
color:#333;
}
#NewsList li.newsSummary a.readMoreLink {
color:#0083C8;
text-decoration:none;
}
#NewsList li.newsSummary a.readMoreLink:hover {
border-bottom:1px dotted #0083C8;
}
div.newsDetails {
margin-bottom:10px;
}
div.newsDetails p {
color:#666;
margin:0;
font-size:1em;
}
div.pageComments {
background:#f0f0f0;
border:1px dotted #ccc;
padding:10px;
}
#StaffList .staffname {
clear: both;
padding-left: 60px;
height: 1.2em;
}
#StaffList .staffphoto {
float: left;
margin-left: 3px;
margin-top: -1.2em;
}
#StaffList .staffphoto img {
border:1px solid #AAA;
}
#StaffList .staffdescription {
margin-left: 60px;
margin-bottom:30px;
}
#StaffPhoto {
float: left;
margin-right: 10px;
}
#StaffPhoto img {
border:1px solid #AAA;
}
#PageComments {
list-style:none;
background:#e9e9e9;
border:1px solid #ccc;
border-bottom:0;
padding:0;
margin:0;
}
#PageComments li {
list-style:none;
padding:5px;
margin:0;
font-size:1em;
border-bottom:1px dotted #bbb;
}
#PageComments li p span {
font-style:italic;
}
#PageComments a.deletelink {
font-weight:bold;
}
#PageNumbers {
font-weight:bold;
color:#333;
font-size:1.1em;
text-align:center;
padding:5px;
border:1px solid #ddd;
background:#e9e9e9;
}
#PageNumbers * {
padding:0 5px;
line-height:1.5em;
}
#PageNumbers a {
color:#0083C8;
text-decoration:none;
}
#PageNumbers a:hover {
text-decoration:underline;
}

View File

@ -1,113 +0,0 @@
/**
* This typography file is included in the WYSIWYG editor
*/
.typography * {
font-family:Verdana,Arial,sans-serif;
font-size:1em;
}
.typography blockquote {
margin-left:20px;
}
.typography hr {
padding:5px;
}
.typography p,
.typography ul li,
.typography ol li,
.typography a {
color:#333;
line-height:1.5em;
font-size:1.1em;
}
.typography p {
margin-bottom:20px;
}
/** CMS LIST STYLES **/
.typography ul,
.typography ol {
margin-left:10px;
margin-bottom:20px;
}
.typography ul li,
.typography ol li {
margin:4px 10px;
line-height:1.4em;
}
.typography ul li {
list-style-type:disc;
}
.typography ol li {
list-style-type:decimal;
}
/* HEADER STYLES */
.typography h1,
.typography h2,
.typography h3,
.typography h4 {
margin-bottom:14px;
color:#0083C8;
}
.typography h1,
.typography h4 {
font-weight:bold;
}
.typography h2,
.typography h3 {
font-weight:normal;
}
.typography h1 {
font-size:2.2em;
}
.typography h2 {
font-size:2.2em;
}
.typography h3 {
font-size:1.6em;
}
.typography h4 {
font-size:1.4em;
}
/* LINK STYLES */
.typography a {
color:#0083C8;
font-size:1em;
text-decoration:none;
}
.typography a:hover {
text-decoration:underline;
}
.typography table {
font-size:1.1em;
}
.typography table tr td {
padding:3px 5px;
}
/* WYSIWYG EDITOR ALIGNMENT CLASSES */
.typography .left {
text-align:left;
}
.typography .center {
text-align:center;
}
.typography .right {
text-align:right;
}
.typography img.right {
float:right;
}
.typography img.left {
float:left;
}
.typography p.MsoNormal, .typography p.MsoBodyText {
margin: 0;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
<head>
<% base_tag %>
<link rel="stylesheet" type="text/css" href="tutorial/css/layout.css" />
<link rel="stylesheet" type="text/css" href="tutorial/css/typography.css" />
<link rel="stylesheet" type="text/css" href="tutorial/css/form.css" />
</head>
<body>
<div id="Main">
<div id="Header">
<h1>&nbsp;</h1>
</div>
<div id="ContentContainer">
<div id="Content" class="typography">
$Content
$Form
</div>
</div>
<div id="Footer">
<span>Visit <a href="http://www.silverstripe.org" title="Visit www.silverstripe.org">www.silverstripe.org</a> to download the CMS</span>
</div>
</div>
$SilverStripeNavigator
</body>
</html>

View File

@ -1,5 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <!-- Routing configuration for Microsoft IIS web server -->
<configuration> <configuration>
<system.webServer> <system.webServer>
</system.webServer> <rewrite>
<rules>
<rule name="SilverStripe Global URLs">
<match url="^(.*)$" />
<conditions>
<add input="{R:1}" matchType="Pattern" pattern="public(/|$)" negate="true" />
</conditions>
<action type="Rewrite" url="public/{R:1}" appendQueryString="true" />
</rule>
<rule name="SilverStripe Preprocessed URLs" stopProcessing="true">
<match url="^(.*)$" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
</conditions>
<action type="Rewrite" url="public/index.php" appendQueryString="true" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration> </configuration>