mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #486 from GrahamCampbell/composer

Browse Source 
Composer Fixes
This commit is contained in:
Samuel Georges 2014-07-29 08:57:15 +10:00
commit 5d1480d6b9
5 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
composer.json
View File

@ -25,15 +25,12 @@
"require": {
"php": ">=5.4",
"laravel/framework": "4.2.*",
"october/system": "dev-master",
"october/backend": "dev-master",
"october/cms": "dev-master",
"october/rain": "dev-master"
"october/system": "~1.0",
"october/backend": "~1.0",
"october/cms": "~1.0",
"october/rain": "~1.0"
},
"require-dev": {
"mockery/mockery": "dev-master"
},
"autoload": {
"autoload-dev": {
"classmap": [
"tests/TestCase.php",
"tests/UiTestCase.php"

12
modules/backend/composer.json
View File

@ -16,19 +16,19 @@
}
],
"require": {
"php": ">=5.3.0",
"october/rain": "dev-master",
"composer/installers": "~1.0"
"php": ">=5.4.0",
"composer/installers": "~1.0",
"october/rain": "~1.0"
},
"autoload": {
"psr-0": {
"Backend": ""
}
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.0-dev"
}
}
},
"minimum-stability": "dev"
}

12
modules/cms/composer.json
View File

@ -16,19 +16,19 @@
}
],
"require": {
"php": ">=5.3.0",
"october/rain": "dev-master",
"composer/installers": "~1.0"
"php": ">=5.4.0",
"composer/installers": "~1.0",
"october/rain": "~1.0"
},
"autoload": {
"psr-0": {
"Cms": ""
}
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.0-dev"
}
}
},
"minimum-stability": "dev"
}

12
modules/system/composer.json
View File

@ -16,19 +16,19 @@
}
],
"require": {
"php": ">=5.3.0",
"october/rain": "dev-master",
"composer/installers": "~1.0"
"php": ">=5.4.0",
"composer/installers": "~1.0",
"october/rain": "~1.0"
},
"autoload": {
"psr-0": {
"System": ""
}
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.0-dev"
}
}
},
"minimum-stability": "dev"
}

9
tests/unit/cms/classes/ControllerTest.php
View File

@ -5,11 +5,6 @@ use Cms\Classes\Theme;
class ControllerTest extends TestCase
{
public function tearDown()
{
Mockery::close();
}
public function test404()
{
/*
@ -152,7 +147,7 @@ class ControllerTest extends TestCase
with($this->stringContains('X_OCTOBER_REQUEST_HANDLER'), $this->anything())->
will($this->returnValue($handler));
if ($partials !== false)
if ($partials !== false)
$requestMock->expects($this->at(1))->
method('header')->
with($this->stringContains('X_OCTOBER_REQUEST_PARTIALS'), $this->anything())->
@ -316,7 +311,7 @@ ESC;
$this->assertArrayHasKey('firstAlias', $page->components);
$this->assertArrayHasKey('secondAlias', $page->components);
$component = $page->components['firstAlias'];
$component2 = $page->components['secondAlias'];