From 377a68848e85e5701691cfdca0ea7e7a0e4263be Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 14 Jan 2013 18:32:43 +0100 Subject: [PATCH 01/11] 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. --- .gitattributes | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..278e73c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,13 @@ +.gitattributes export-ignore +behat.yml export-ignore +build.properties.default export-ignore +build.xml export-ignore +changelog-definitions.default export-ignore +CONTRIBUTING.md export-ignore +dependent-modules.default export-ignore +Makefile export-ignore +phpunit.teamcity.mssql.xml export-ignore +phpunit.teamcity.postgresql.xml export-ignore +phpunit.teamcity.sqlite3.xml export-ignore +phpunit.teamcity.xml export-ignore +phpunit.xml.dist export-ignore \ No newline at end of file From 5c91cc1f61564d1788b9262b933b816ec72cf433 Mon Sep 17 00:00:00 2001 From: Nicolaas Date: Wed, 3 Apr 2013 15:54:31 +1300 Subject: [PATCH 02/11] IIS 7.5 does not like forward slash at the end of silverstripe-cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit IIS 7.5 does not like forward slash at the end of silverstripe-cache --- web.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web.config b/web.config index 56df27f..1d0c734 100644 --- a/web.config +++ b/web.config @@ -3,7 +3,7 @@ - + @@ -15,4 +15,4 @@ - \ No newline at end of file + From 345a32ec3eea9203e869cb22307868bfcd7b0c6a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 7 May 2013 10:51:47 +0200 Subject: [PATCH 03/11] Remove require-dev section, composer doesn't handle it well Any "composer require " 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 && composer update --no-dev ", 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). --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index c4689f1..162cb0d 100644 --- a/composer.json +++ b/composer.json @@ -7,12 +7,6 @@ "silverstripe/framework": "3.0.*@stable", "silverstripe-themes/simple": "*" }, - "require-dev": { - "silverstripe/docsviewer": "*", - "silverstripe/behat-extension": "*", - "silverstripe/buildtools": "*", - "phpunit/phpunit": "3.7.*" - }, "config": { "process-timeout": 600 }, From c929a5944d0c3dedede156ef545ffc8217cf09a7 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 9 May 2013 16:00:50 +0200 Subject: [PATCH 04/11] Updated behat.yml to reflect changes in behat-extension module --- behat.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/behat.yml b/behat.yml index 295669d..8ec35fd 100644 --- a/behat.yml +++ b/behat.yml @@ -1,13 +1,9 @@ default: extensions: - SilverStripe\BehatExtension\Extension: - framework_path: framework - - Behat\MinkExtension\Extension: - # Adjust this to your own website URL. - # Uncomment, or set through environment variable: - # > export BEHAT_PARAMS="extensions[Behat\MinkExtension\Extension][base_url]=http://localhost/" + SilverStripe\BehatExtension\MinkExtension: + # Adjust "base_url" to your own website URL. + # Can be set via environment variables or _ss_environment.php/$_FILE_TO_URL_MAPPING as well. # # base_url: http://localhost/ @@ -17,4 +13,6 @@ default: javascript_session: selenium2 goutte: ~ selenium2: - browser: firefox \ No newline at end of file + browser: firefox + + SilverStripe\BehatExtension\Extension: ~ \ No newline at end of file From bf81f0394aa4c9ab68e5efd2fdfdc17039b73b32 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Mon, 13 May 2013 21:07:57 +1200 Subject: [PATCH 05/11] 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. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3134fd6..be1648e 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,8 @@ "description": "The SilverStripe Framework Installer", "require": { "php": ">=5.3.2", - "silverstripe/cms": "3.1.x-dev", - "silverstripe/framework": "3.1.x-dev", + "silverstripe/cms": "self.version", + "silverstripe/framework": "self.version", "silverstripe-themes/simple": "*" }, "config": { From 16380f68bfd69c96a349705ede0d616a91601e1e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 17 May 2013 00:49:19 +0200 Subject: [PATCH 06/11] Updated github path --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e44c76e..87fd4ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ For submitting patches, please read our [guide to contributing code](http://doc. * [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/sapphire/issues) + * [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) diff --git a/README.md b/README.md index 5323d68..eb7627e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Requires additional modules to function: - * [`framework`](http://github.com/silverstripe/sapphire): Module including the base framework + * [`framework`](http://github.com/silverstripe/silverstripe-framework): Module including the base framework * [`cms`](http://github.com/silverstripe/silverstripe-cms): Module including a Content Management System * `themes/simple` (optional) @@ -23,7 +23,7 @@ If you would like to make changes to the SilverStripe core codebase, we have an ## Links ## * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/) - * [Bugtracker: Framework](https://github.com/silverstripe/sapphire/issues) + * [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) From 0975787f004611a5ef11be3e0ea118e00aaebc9e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 17 May 2013 00:49:19 +0200 Subject: [PATCH 07/11] Updated github path --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e44c76e..87fd4ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ For submitting patches, please read our [guide to contributing code](http://doc. * [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/sapphire/issues) + * [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) diff --git a/README.md b/README.md index 5323d68..eb7627e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Requires additional modules to function: - * [`framework`](http://github.com/silverstripe/sapphire): Module including the base framework + * [`framework`](http://github.com/silverstripe/silverstripe-framework): Module including the base framework * [`cms`](http://github.com/silverstripe/silverstripe-cms): Module including a Content Management System * `themes/simple` (optional) @@ -23,7 +23,7 @@ If you would like to make changes to the SilverStripe core codebase, we have an ## Links ## * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/) - * [Bugtracker: Framework](https://github.com/silverstripe/sapphire/issues) + * [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) From 04be57318733ec532bf4b3c14385e5354eeced9a Mon Sep 17 00:00:00 2001 From: Nightjar Date: Sat, 25 May 2013 19:43:13 +1200 Subject: [PATCH 08/11] case insensitive the assets/ allowed extensions for Apache --- assets/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/.htaccess b/assets/.htaccess index 14d3bca..070e663 100644 --- a/assets/.htaccess +++ b/assets/.htaccess @@ -23,7 +23,7 @@ # does not support regular expression case insensitive matches using PCRE style. # Deny from all - + Allow from all From 7403a844e09c45a06ecf61e2ef9fb86a4d704da6 Mon Sep 17 00:00:00 2001 From: Elvinas Date: Mon, 27 May 2013 21:32:04 +0300 Subject: [PATCH 09/11] HTML5 video file types. --- assets/.htaccess | 2 +- assets/web.config | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/.htaccess b/assets/.htaccess index 070e663..eef9282 100644 --- a/assets/.htaccess +++ b/assets/.htaccess @@ -23,7 +23,7 @@ # does not support regular expression case insensitive matches using PCRE style. # Deny from all - + Allow from all diff --git a/assets/web.config b/assets/web.config index df26900..d8567e0 100644 --- a/assets/web.config +++ b/assets/web.config @@ -57,6 +57,8 @@ directory. + + From 26147bb962ba8246e3bb0dc61624bcc45019d996 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 30 May 2013 16:23:29 +1200 Subject: [PATCH 10/11] 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. --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index be1648e..a51123a 100644 --- a/composer.json +++ b/composer.json @@ -10,5 +10,9 @@ "config": { "process-timeout": 600 }, + "scripts": { + "post-install-cmd": "php ./framework/cli-script.php dev/build", + "post-update-cmd": "php ./framework/cli-script.php dev/build" + }, "minimum-stability": "dev" } From e9f13512dcd7ec6cf6e916c07ce0375a62c34c13 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 30 May 2013 16:27:27 +1200 Subject: [PATCH 11/11] 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! --- .gitignore | 1 - composer.json | 4 +- composer.lock | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 0f33c73..c6e9aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,3 @@ silverstripe-cache .idea .DS_Store vendor/ -composer.lock \ No newline at end of file diff --git a/composer.json b/composer.json index 162cb0d..be1648e 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,8 @@ "description": "The SilverStripe Framework Installer", "require": { "php": ">=5.3.2", - "silverstripe/cms": "3.0.*@stable", - "silverstripe/framework": "3.0.*@stable", + "silverstripe/cms": "self.version", + "silverstripe/framework": "self.version", "silverstripe-themes/simple": "*" }, "config": { diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..83ea3f8 --- /dev/null +++ b/composer.lock @@ -0,0 +1,226 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" + ], + "hash": "351c3c25e8ad3f3e9bec6672374d4746", + "packages": [ + { + "name": "composer/installers", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1", + "reference": "3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1", + "shasum": "" + }, + "replace": { + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "3.7.*" + }, + "type": "composer-installer", + "extra": { + "class": "Composer\\Installers\\Installer", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "notification-url": "https://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": [ + "TYPO3 Flow", + "TYPO3 Neos", + "agl", + "cakephp", + "codeigniter", + "drupal", + "fuelphp", + "installer", + "joomla", + "kohana", + "laravel", + "li3", + "lithium", + "mako", + "phpbb", + "ppi", + "silverstripe", + "symfony", + "wordpress", + "zend" + ], + "time": "2013-05-25 02:21:36" + }, + { + "name": "silverstripe-themes/simple", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/silverstripe-themes/silverstripe-simple.git", + "reference": "0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silverstripe-themes/silverstripe-simple/zipball/0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3", + "reference": "0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3", + "shasum": "" + }, + "require": { + "composer/installers": "*", + "silverstripe/framework": ">=3.0" + }, + "type": "silverstripe-theme", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sara Tušar (Innovaif)", + "homepage": "http://www.saratusar.com" + } + ], + "description": "The SilverStripe simple theme (default SilverStripe 3 theme)", + "keywords": [ + "silverstripe", + "theme" + ], + "time": "2013-05-08 06:38:58" + }, + { + "name": "silverstripe/cms", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/silverstripe/silverstripe-cms.git", + "reference": "2809b009a17435ac0fa25f5df89a88f316ee517b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silverstripe/silverstripe-cms/zipball/2809b009a17435ac0fa25f5df89a88f316ee517b", + "reference": "2809b009a17435ac0fa25f5df89a88f316ee517b", + "shasum": "" + }, + "require": { + "composer/installers": "*", + "php": ">=5.3.2", + "silverstripe/framework": "3.0.*" + }, + "type": "silverstripe-module", + "autoload": { + "classmap": [ + "tests/behat/" + ] + }, + "notification-url": "https://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", + "keywords": [ + "cms", + "silverstripe" + ], + "time": "2013-05-25 07:59:08" + }, + { + "name": "silverstripe/framework", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/silverstripe/silverstripe-framework.git", + "reference": "f6fbd78cd9c11d5a316335b0dd751a2902e76a0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/f6fbd78cd9c11d5a316335b0dd751a2902e76a0a", + "reference": "f6fbd78cd9c11d5a316335b0dd751a2902e76a0a", + "shasum": "" + }, + "require": { + "composer/installers": "*", + "php": ">=5.3.2" + }, + "type": "silverstripe-module", + "autoload": { + "classmap": [ + "tests/behat/features/bootstrap" + ] + }, + "notification-url": "https://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" + ], + "time": "2013-05-25 06:50:41" + } + ], + "packages-dev": [ + + ], + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": { + "silverstripe/cms": 20, + "silverstripe/framework": 20 + }, + "platform": { + "php": ">=5.3.2" + }, + "platform-dev": [ + + ] +}