Permalink
Browse files

Update libraries and fix testsuite

  • Loading branch information...
1 parent 300c67c commit 748b082db8508f5c4c720565da3e89894a5d94f1 @Baachi Baachi committed Feb 3, 2013
View
@@ -8,13 +8,17 @@
"require": {
"php": ">=5.3.2",
- "kriswallsmith/buzz": "dev-master",
- "doctrine/common": "dev-master",
- "doctrine/mongodb-odm": "dev-master"
+ "doctrine/common": "2.3.*"
+ },
+ "require-dev": {
+ "kriswallsmith/buzz": "0.7.*",
+ "doctrine/mongodb": "1.0.*",
+ "doctrine/mongodb-odm": "1.0.*"
},
"autoload": {
"psr-0": {
"Doctrine\\Search": "lib/"
}
- }
+ },
+ "minimum-stability": "dev"
}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -104,7 +104,7 @@ protected function getDriver()
* @param bool $rootEntityFound
* @return void
*/
- protected function doLoadMetadata($class, $parent, $rootEntityFound)
+ protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonSuperclassParents)
{
//Manipulates $classMetadata;
$this->driver->loadMetadataForClass($class->getName(), $class);
@@ -146,4 +146,9 @@ protected function initializeReflection(BaseClassMetadata $class, ReflectionServ
{
// TODO: Implement initializeReflection() method.
}
+
+ protected function isEntity(BaseClassMetadata $class)
+ {
+
+ }
}
View
@@ -13,15 +13,10 @@
>
<testsuites>
<testsuite name="Doctrine Search Test Suite">
- <directory>./tests/Unit/Doctrine/Search</directory>
+ <directory>./tests/Doctrine/Tests/Search</directory>
</testsuite>
</testsuites>
- <php>
- <!-- <server name="CLOSURE_JAR" value="/path/to/google-closure/compiler.jar" /> -->
- <!-- <server name="COFFEE_BIN" value="/path/to/coffee" /> -->
- </php>
-
<filter>
<whitelist>
<directory suffix=".php">./lib/Doctrine/Search</directory>
@@ -23,7 +23,9 @@ protected function setUp()
public function testCallExistingHost()
{
- $buzzResponse = $this->getMock('Buzz\\Message\\Response');
+ $buzzResponse = $this->getMockBuilder('Buzz\\Message\\Response')
+ ->disableOriginalConstructor()
+ ->getMock();
$this->browser->expects($this->once())
->method('call')
@@ -36,18 +38,4 @@ public function testCallExistingHost()
/*$this->assertContains('<html>', $response->getContent());
$this->assertTrue($response->isSuccessfull());*/
}
-
-
- public function testCallNotExistingHost()
- {
- $this->setExpectedException('\RuntimeException');
-
- $clientAdapter = new FileGetContentsMock();
-
- $browser = new Browser($clientAdapter);
-
- $client = new BuzzClient($browser, 'www.not-existing-host.de', 80);
- $client->sendRequest('get');
- }
-
}
Oops, something went wrong.

0 comments on commit 748b082

Please sign in to comment.