Twig 3 support

Author: vtsykun

src/Tests/Unit/Migration/MigrationExecutorWithNameGeneratorTest.php

@@ -44,7 +44,7 @@ public function testExecuteUp()
             ->method('executeQuery')
             ->with(
                 'CREATE TABLE test1table (id INT NOT NULL) DEFAULT CHARACTER SET utf8 '
-                . 'COLLATE utf8_unicode_ci ENGINE = InnoDB'
+                . 'COLLATE `utf8_unicode_ci` ENGINE = InnoDB'
             );
         $this->connection->expects($this->at(5))
             ->method('executeQuery')
@@ -58,7 +58,7 @@ public function testExecuteUp()
                 'CREATE TABLE TEST (id INT AUTO_INCREMENT NOT NULL)',
                 '> ' . get_class($migration11),
                 'CREATE TABLE test1table (id INT NOT NULL) DEFAULT CHARACTER SET utf8 '
-                . 'COLLATE utf8_unicode_ci ENGINE = InnoDB',
+                . 'COLLATE `utf8_unicode_ci` ENGINE = InnoDB',
                 'ALTER TABLE TEST ADD COLUMN test_column INT NOT NULL',
             ],
             $messages
@@ -85,7 +85,7 @@ public function testExecuteUpWithDryRun()
                 'CREATE TABLE TEST (id INT AUTO_INCREMENT NOT NULL)',
                 '> ' . get_class($migration11),
                 'CREATE TABLE test1table (id INT NOT NULL) DEFAULT CHARACTER SET utf8 '
-                . 'COLLATE utf8_unicode_ci ENGINE = InnoDB',
+                . 'COLLATE `utf8_unicode_ci` ENGINE = InnoDB',
                 'ALTER TABLE TEST ADD COLUMN test_column INT NOT NULL',
             ],
             $messages

src/Tests/Unit/Tools/SchemaDumperTest.php

@@ -24,7 +24,7 @@ class SchemaDumperTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
+        $this->twig = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
         $this->schema = new Schema();
         $this->schemaDumper = new SchemaDumper($this->twig, 'Migrations/Schema');