From a2501ad2095edab8efd6bdece5b75f984a9905be Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 9 Nov 2012 11:48:34 +0100 Subject: [PATCH 01/10] Fixed bootstrap.php path in phpunit.xml.dist --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d0d294eb..ea32e8a8 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -13,7 +13,7 @@ - sapphire/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool. --> From 9fa3c5216948cf5c1b7d3c6a219ecd3d9db7631c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 28 Nov 2012 15:47:28 +0100 Subject: [PATCH 02/10] Exclude vendor/ folder from default phpunit run Once we start placing SS modules in vendor/, we need to find a smarter solution... --- phpunit.xml.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ea32e8a8..3767765d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -18,6 +18,7 @@ > ./ + vendor/ From c80265981eb919bab658c8e13e76af1d7c33ca56 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 4 Dec 2012 11:17:55 +1300 Subject: [PATCH 03/10] 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. --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 4d36a693..21ac61bc 100644 --- a/composer.json +++ b/composer.json @@ -3,9 +3,9 @@ "description": "The SilverStripe Framework Installer", "require": { "php": ">=5.2.4", - "silverstripe/cms": "2.4.x-dev", - "silverstripe/framework": "2.4.x-dev", - "silverstripe-themes/blackcandy": "2.4.x-dev" + "silverstripe/cms": "2.4.*", + "silverstripe/framework": "2.4.*", + "silverstripe-themes/blackcandy": "2.4.*" }, "minimum-stability": "dev", "extra": { @@ -13,4 +13,4 @@ "sapphire": ["silverstripe/framework"] } } -} \ No newline at end of file +} From 2ea9f262e85d41c3dde9caf7de41414764bc4b24 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 4 Dec 2012 17:21:29 +0100 Subject: [PATCH 04/10] 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. --- install.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install.php b/install.php index 7728e5ca..5c2e7a85 100644 --- a/install.php +++ b/install.php @@ -913,9 +913,17 @@ function install($config) { Installing SilverStripe... + + + + + + + + From 9c254cd72b4b278323e539e113341a283a95ab61 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 5 Dec 2012 01:10:13 +0100 Subject: [PATCH 05/10] Added @stable markers to composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 21ac61bc..85e82bcc 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,8 @@ "description": "The SilverStripe Framework Installer", "require": { "php": ">=5.2.4", - "silverstripe/cms": "2.4.*", - "silverstripe/framework": "2.4.*", + "silverstripe/cms": "2.4.*@stable", + "silverstripe/framework": "2.4.*@stable", "silverstripe-themes/blackcandy": "2.4.*" }, "minimum-stability": "dev", From 08c349574bb79b4a41a638bbbc9a2786de322937 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 5 Dec 2012 01:11:21 +0100 Subject: [PATCH 06/10] Added composer.lock for 2.4.9 --- composer.lock | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 composer.lock diff --git a/composer.lock b/composer.lock new file mode 100644 index 00000000..3802b725 --- /dev/null +++ b/composer.lock @@ -0,0 +1,201 @@ +{ + "hash": "5bba0b0517a7c450e0abba1d14eb680a", + "packages": [ + { + "name": "composer/installers", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/composer/installers", + "reference": "f84aa7a6fdba08eacc18ca9b098d3a59dd604238" + }, + "dist": { + "type": "zip", + "url": "https://github.com/composer/installers/archive/f84aa7a6fdba08eacc18ca9b098d3a59dd604238.zip", + "reference": "f84aa7a6fdba08eacc18ca9b098d3a59dd604238", + "shasum": "" + }, + "replace": { + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev" + }, + "time": "2012-12-03 17:52:37", + "type": "composer-installer", + "extra": { + "class": "Composer\\Installers\\Installer" + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama", + "role": "Developer" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "http://composer.github.com/installers/", + "keywords": [ + "symfony", + "installer", + "zend", + "wordpress", + "cakephp", + "codeigniter", + "fuelphp", + "drupal", + "lithium", + "li3", + "joomla", + "laravel", + "phpbb", + "ppi", + "silverstripe", + "kohana", + "mako", + "agl" + ] + }, + { + "name": "silverstripe-themes/blackcandy", + "version": "2.4.x-dev", + "source": { + "type": "git", + "url": "git@github.com:silverstripe-themes/silverstripe-blackcandy.git", + "reference": "79707f2700d90472d543a5d56c156c1b0a79667c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/silverstripe-themes/silverstripe-blackcandy/archive/79707f2700d90472d543a5d56c156c1b0a79667c.zip", + "reference": "79707f2700d90472d543a5d56c156c1b0a79667c", + "shasum": "" + }, + "require": { + "composer/installers": "*" + }, + "time": "2012-11-02 17:45:53", + "type": "silverstripe-theme", + "installation-source": "dist", + "notification-url": "http://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "SilverStripe", + "homepage": "http://www.silverstripe.org" + } + ], + "description": "The SilverStripe BlackCandy Theme (default SilverStripe 2.x theme)", + "keywords": [ + "theme", + "silverstripe" + ] + }, + { + "name": "silverstripe/cms", + "version": "2.4.9", + "source": { + "type": "git", + "url": "https://github.com/silverstripe/silverstripe-cms.git", + "reference": "2.4.9" + }, + "dist": { + "type": "zip", + "url": "https://github.com/silverstripe/silverstripe-cms/archive/2.4.9.zip", + "reference": "2.4.9", + "shasum": "" + }, + "require": { + "php": ">=5.2.4", + "composer/installers": "*", + "silverstripe/framework": "self.version" + }, + "time": "2012-12-04 11:07:17", + "type": "silverstripe-module", + "installation-source": "dist", + "notification-url": "http://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "SilverStripe", + "homepage": "http://silverstripe.com" + }, + { + "name": "The SilverStripe Community", + "homepage": "http://silverstripe.org" + } + ], + "description": "The SilverStripe Content Management System", + "homepage": "http://silverstripe.org/cms", + "keywords": [ + "cms", + "silverstripe" + ] + }, + { + "name": "silverstripe/framework", + "version": "2.4.9", + "source": { + "type": "git", + "url": "https://github.com/silverstripe/sapphire", + "reference": "2.4.9" + }, + "dist": { + "type": "zip", + "url": "https://github.com/silverstripe/sapphire/archive/2.4.9.zip", + "reference": "2.4.9", + "shasum": "" + }, + "require": { + "php": ">=5.2.4", + "composer/installers": "*" + }, + "time": "2012-12-04 21:47:47", + "type": "silverstripe-module", + "installation-source": "dist", + "notification-url": "http://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "SilverStripe", + "homepage": "http://silverstripe.com" + }, + { + "name": "The SilverStripe Community", + "homepage": "http://silverstripe.org" + } + ], + "description": "The SilverStripe Framework", + "homepage": "http://silverstripe.org", + "keywords": [ + "framework", + "silverstripe" + ] + } + ], + "packages-dev": null, + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": { + "silverstripe/cms": 0, + "silverstripe/framework": 0 + } +} From 736856fbd7594525ad5967213ae9c5d8a4cedfb4 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 5 Dec 2012 01:11:21 +0100 Subject: [PATCH 07/10] Removed composer.lock --- composer.lock | 201 -------------------------------------------------- 1 file changed, 201 deletions(-) delete mode 100644 composer.lock diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 3802b725..00000000 --- a/composer.lock +++ /dev/null @@ -1,201 +0,0 @@ -{ - "hash": "5bba0b0517a7c450e0abba1d14eb680a", - "packages": [ - { - "name": "composer/installers", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/composer/installers", - "reference": "f84aa7a6fdba08eacc18ca9b098d3a59dd604238" - }, - "dist": { - "type": "zip", - "url": "https://github.com/composer/installers/archive/f84aa7a6fdba08eacc18ca9b098d3a59dd604238.zip", - "reference": "f84aa7a6fdba08eacc18ca9b098d3a59dd604238", - "shasum": "" - }, - "replace": { - "shama/baton": "*" - }, - "require-dev": { - "composer/composer": "1.0.*@dev" - }, - "time": "2012-12-03 17:52:37", - "type": "composer-installer", - "extra": { - "class": "Composer\\Installers\\Installer" - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Composer\\Installers\\": "src/" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kyle Robinson Young", - "email": "kyle@dontkry.com", - "homepage": "https://github.com/shama", - "role": "Developer" - } - ], - "description": "A multi-framework Composer library installer", - "homepage": "http://composer.github.com/installers/", - "keywords": [ - "symfony", - "installer", - "zend", - "wordpress", - "cakephp", - "codeigniter", - "fuelphp", - "drupal", - "lithium", - "li3", - "joomla", - "laravel", - "phpbb", - "ppi", - "silverstripe", - "kohana", - "mako", - "agl" - ] - }, - { - "name": "silverstripe-themes/blackcandy", - "version": "2.4.x-dev", - "source": { - "type": "git", - "url": "git@github.com:silverstripe-themes/silverstripe-blackcandy.git", - "reference": "79707f2700d90472d543a5d56c156c1b0a79667c" - }, - "dist": { - "type": "zip", - "url": "https://github.com/silverstripe-themes/silverstripe-blackcandy/archive/79707f2700d90472d543a5d56c156c1b0a79667c.zip", - "reference": "79707f2700d90472d543a5d56c156c1b0a79667c", - "shasum": "" - }, - "require": { - "composer/installers": "*" - }, - "time": "2012-11-02 17:45:53", - "type": "silverstripe-theme", - "installation-source": "dist", - "notification-url": "http://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "SilverStripe", - "homepage": "http://www.silverstripe.org" - } - ], - "description": "The SilverStripe BlackCandy Theme (default SilverStripe 2.x theme)", - "keywords": [ - "theme", - "silverstripe" - ] - }, - { - "name": "silverstripe/cms", - "version": "2.4.9", - "source": { - "type": "git", - "url": "https://github.com/silverstripe/silverstripe-cms.git", - "reference": "2.4.9" - }, - "dist": { - "type": "zip", - "url": "https://github.com/silverstripe/silverstripe-cms/archive/2.4.9.zip", - "reference": "2.4.9", - "shasum": "" - }, - "require": { - "php": ">=5.2.4", - "composer/installers": "*", - "silverstripe/framework": "self.version" - }, - "time": "2012-12-04 11:07:17", - "type": "silverstripe-module", - "installation-source": "dist", - "notification-url": "http://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "SilverStripe", - "homepage": "http://silverstripe.com" - }, - { - "name": "The SilverStripe Community", - "homepage": "http://silverstripe.org" - } - ], - "description": "The SilverStripe Content Management System", - "homepage": "http://silverstripe.org/cms", - "keywords": [ - "cms", - "silverstripe" - ] - }, - { - "name": "silverstripe/framework", - "version": "2.4.9", - "source": { - "type": "git", - "url": "https://github.com/silverstripe/sapphire", - "reference": "2.4.9" - }, - "dist": { - "type": "zip", - "url": "https://github.com/silverstripe/sapphire/archive/2.4.9.zip", - "reference": "2.4.9", - "shasum": "" - }, - "require": { - "php": ">=5.2.4", - "composer/installers": "*" - }, - "time": "2012-12-04 21:47:47", - "type": "silverstripe-module", - "installation-source": "dist", - "notification-url": "http://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "SilverStripe", - "homepage": "http://silverstripe.com" - }, - { - "name": "The SilverStripe Community", - "homepage": "http://silverstripe.org" - } - ], - "description": "The SilverStripe Framework", - "homepage": "http://silverstripe.org", - "keywords": [ - "framework", - "silverstripe" - ] - } - ], - "packages-dev": null, - "aliases": [ - - ], - "minimum-stability": "dev", - "stability-flags": { - "silverstripe/cms": 0, - "silverstripe/framework": 0 - } -} From 738d9dbff6a14f3dd2aa7edd3aefe38540d62f31 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 5 Dec 2012 11:58:43 +0100 Subject: [PATCH 08/10] Added phing support --- build.xml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 build.xml diff --git a/build.xml b/build.xml new file mode 100644 index 00000000..3ad3e302 --- /dev/null +++ b/build.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 52590b901966ece8c36a541ce8430d417d2290dc Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 7 Dec 2012 00:42:44 +0100 Subject: [PATCH 09/10] Removed @stable tags from release branch Same as 3.0.x-dev, they're only relevant for tags, not for branches. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 85e82bcc..21ac61bc 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,8 @@ "description": "The SilverStripe Framework Installer", "require": { "php": ">=5.2.4", - "silverstripe/cms": "2.4.*@stable", - "silverstripe/framework": "2.4.*@stable", + "silverstripe/cms": "2.4.*", + "silverstripe/framework": "2.4.*", "silverstripe-themes/blackcandy": "2.4.*" }, "minimum-stability": "dev", From 23523175f38a4aa5a21a6f98ef44918e2b6774f6 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 15 Feb 2013 19:13:41 +0100 Subject: [PATCH 10/10] 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. --- .htaccess | 2 ++ web.config | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 81ef22cd..4cda2c7a 100644 --- a/.htaccess +++ b/.htaccess @@ -15,6 +15,8 @@ ErrorDocument 500 /assets/error-500.html RedirectMatch 403 /silverstripe-cache(/|$) + RedirectMatch 403 /vendor(/|$) + RedirectMatch 403 /composer\.(json|lock) diff --git a/web.config b/web.config index a04afa1c..1d956b52 100644 --- a/web.config +++ b/web.config @@ -1,5 +1,17 @@ - + + + + + + + + + + + + + \ No newline at end of file