From 377a68848e85e5701691cfdca0ea7e7a0e4263be Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 14 Jan 2013 18:32:43 +0100 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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