Commit Graph

731 Commits

Author SHA1 Message Date
Damian Mooyman a2e1540c11 Merge pull request #85 from assertchris/feature/3.0/add-phpunit-to-dev-dependencies
Added phpunit to dev dependencies
2015-02-26 14:26:16 +13:00
Christopher Pitt 50e8d3d2b4 Added phpunit to dev dependencies 2015-02-26 14:24:05 +13:00
Sean Harvey 7b703f727b Merge pull request #69 from chillu/pulls/gitattrs
Remove .gitattributes, it breaks unit/behat test usage
2014-09-05 16:59:22 +12:00
Ingo Schommer a9f138397a Remove .gitattributes, it breaks unit/behat test usage
Since it excludes behat.yml and phpunit.xml.dist,
and "composer install" uses github archives for stable versions,
you can't use projects installed this way for testing any more.
To make matters worse, the error you get on a "phpunit" run
is very confusing ('class SapphireTest not found').
2014-09-05 14:02:49 +12: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 dae9b18558 Merge tag '3.0.7-rc1' into 3.0 2013-09-27 00:21:56 +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 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
Simon Welsh 4fd75527dc Block access to .yaml files as well as .yml 2013-07-01 12:59:31 +12: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
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
Ingo Schommer 16380f68bf Updated github path 2013-05-17 00:49:19 +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 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
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 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 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