Skip to content
This repository
Browse code

Merge branch '3.7'

  • Loading branch information...
commit 40497f1292fc857707041a51c7d359fa870d31c9 2 parents 6fd7f87 + 4814287
Sebastian Bergmann authored October 14, 2012
1  .gitignore
@@ -12,3 +12,4 @@ Tests/TextUI/*.log
12 12
 Tests/TextUI/*.out
13 13
 Tests/TextUI/*.php
14 14
 phpunit.xml
  15
+cache.properties
3  PHPUnit/Util/Log/TAP.php
@@ -43,7 +43,8 @@
43 43
  * @since      File available since Release 3.0.0
44 44
  */
45 45
 
46  
-if (!class_exists('Symfony\\Component\\Yaml\\Dumper', FALSE)) {
  46
+if (!class_exists('Symfony\\Component\\Yaml\\Dumper') &&
  47
+    stream_resolve_include_path('Symfony/Component/Yaml/Dumper.php')) {
47 48
     require_once 'Symfony/Component/Yaml/Dumper.php';
48 49
 }
49 50
 

0 notes on commit 40497f1

Please sign in to comment.
Something went wrong with that request. Please try again.