Skip to content

Commit 0038f0f

Browse files
committed
Merge pull request #124 from symfony-cmf/stable-dependencies
stable dependencies
2 parents 4585f7d + 658dbe7 commit 0038f0f

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
"symfony/monolog-bundle": "^2.1|3.*",
1717
"doctrine/common": "^2.4",
1818
"doctrine/doctrine-bundle": "^1.0",
19-
"doctrine/phpcr-odm": "^1.1.0-RC1",
20-
"doctrine/phpcr-bundle": "^1.1.0-beta2",
21-
"doctrine/data-fixtures": "^1.0.0-alpha3",
19+
"doctrine/phpcr-odm": "^1.1",
20+
"doctrine/phpcr-bundle": "^1.1",
21+
"doctrine/data-fixtures": "^1.0",
2222
"jackalope/jackalope": "^1.1.5",
2323
"jackalope/jackalope-doctrine-dbal": "^1.1.5",
24-
"friendsofsymfony/jsrouting-bundle": "^1.1@dev"
24+
"friendsofsymfony/jsrouting-bundle": "^1.1"
2525
},
2626
"autoload": {
2727
"psr-4": {

src/Document/Content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* Very simple, referenceable document.
2222
*
23-
* @deprecated This Document is deprecated as of 1.1 and will be removed in
23+
* @deprecated This Document is deprecated as of 1.1 and will be removed in
2424
* 2.0. Move the fixture to your own bundle instead.
2525
*
2626
* @PHPCRODM\Document(referenceable=true)

src/Functional/DbManager/ORM.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function purgeDatabase()
9393

9494
/**
9595
* Loads fixture classes.
96-
*
96+
*
9797
* @param string[] $classNames
9898
*/
9999
public function loadFixtures(array $classNames)
@@ -110,7 +110,7 @@ public function loadFixtures(array $classNames)
110110

111111
/**
112112
* Loads a single fixture.
113-
*
113+
*
114114
* @param Loader $loader
115115
* @param string $className
116116
*/

src/HttpKernel/TestKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public function registerBundles()
172172
}
173173

174174
/**
175-
* Returns the KernelDir of the CHILD class,
175+
* Returns the KernelDir of the CHILD class,
176176
* i.e. the concrete implementation in the bundles
177177
* src/ directory (or wherever).
178178
*/

src/Phpunit/DatabaseTestListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function startTest(\PHPUnit_Framework_Test $test)
7575
$purger = new Purger\PHPCRPurger($db->getOm());
7676
break;
7777

78-
default;
78+
default:
7979

8080
return;
8181
}

0 commit comments

Comments
 (0)