some fixes for symfony 2.2

Author: Davert

bin/build_phar.php

@@ -7,28 +7,25 @@
 
 // download composer
 
-if (!file_exists('composer.phar')) {
-	file_put_contents('composer.phar', file_get_contents('http://getcomposer.org/installer'));
-}
-system('php composer.phar update');
+//if (!file_exists('composer.phar')) {
+//	file_put_contents('composer.phar', file_get_contents('http://getcomposer.org/installer'));
+//}
+//system('php composer.phar update');
 
+chdir($root);
 $compiler = new Compiler();
 $compiler->compile();
 
-@unlink('package/codecept.phar');
-
 if (file_exists('codecept.phar.gz')) {
     chmod('codecept.phar.gz', 755);
     copy('codecept.phar.gz', 'package/codecept.phar');
 } else {
-    chmod('codecept.phar', 755);
     copy('codecept.phar', 'package/codecept.phar');
+    @exec('chmod 755 package/codecept.phar');
 }
 @unlink('codecept.phar');
 @unlink('codecept.phar.gz');
 
-chmod('package/codecept.phar', 755);
-
 echo system('php package/codecept.phar');
 
-echo "PHAR build finished";
+echo "\nPHAR build finished\n\n";

codecept

@@ -4,13 +4,7 @@
  * Codeception CLI
  */
 
-if (!class_exists('UniversalClassLoader')) {
-    $bootstrap_folder = (is_dir(__DIR__ . '/src'))
-        ? dirname(__FILE__)
-        : 'Codeception';
-
-    require_once $bootstrap_folder.'/autoload.php';
-}
+require_once dirname(__FILE__).'/autoload.php';
 
 if (isset($argv[1])) {
     if (!in_array('run', $argv)) {

package/codecept.phar

@@ -2,8 +2,6 @@
 <?php
 Phar::mapPhar();
 
-chdir(__DIR__);
-
 require_once 'phar://codecept.phar/autoload.php';
 
 require_once 'phar://codecept.phar/codecept';

package/stub.php

@@ -52,7 +52,7 @@ public function _before(\Codeception\TestCase $test)
             if ($this->hasModule('Symfony2')) {
                 $kernel = $this->getModule('Symfony2')->kernel;
                 if ($kernel->getContainer()->has('doctrine')) {
-                    self::$em = $kernel->getContainer()->get('doctrine')->getEntityManager();
+                    self::$em = $kernel->getContainer()->get('doctrine.orm.entity_manager');
                 }
             }
        }

src/Codeception/Module/Doctrine2.php

@@ -1,7 +1,11 @@
 <?php
 namespace Codeception\Module;
+
 use Codeception\Exception\ModuleRequire;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\HttpKernel\Exception\FlattenException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * This module uses Symfony2 Crawler and HttpKernel to emulate requests and get response.
@@ -60,10 +64,6 @@ public function _initialize() {
         require_once $cache;
         $this->kernelClass = $this->getKernelClass();
         $this->kernel = new $this->kernelClass('test', true);
-        $this->kernel->boot();
-        if (!($this->kernel->getContainer() instanceof \Symfony\Component\DependencyInjection\ContainerInterface)) {
-            throw new ModuleRequire(__CLASS__,"Wrong container in Kernel (not implements ContainerInterface)");
-        }
     }
 
     public function _before(\Codeception\TestCase $test) {