From 55ce1ae23b3e0685dbb787231e5c1e9b17f17c96 Mon Sep 17 00:00:00 2001
From: Marek Laska <git@tamcap.one.pl>
Date: Mon, 29 Jun 2015 19:05:30 -0400
Subject: [PATCH 1/2] Update nikic/php-parser to 1.3.*

* Update MethodDisablerVisitor.php and composer.json
* This commit is consistent with the changes made in php-parser v. 1.3
 which also makes the whole thing php7 compatible
---
 composer.json                                             | 2 +-
 src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 212001cb..b37fe940 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     ],
     "require": {
         "php":                       ">=5.3.3",
-        "nikic/php-parser":          "~1.0"
+        "nikic/php-parser":          "~1.3"
     },
     "require-dev": {
         "phpunit/phpunit":           ">=3.7",
diff --git a/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php b/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php
index ad9de858..81482d06 100644
--- a/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php
+++ b/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php
@@ -22,7 +22,7 @@
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Name\FullyQualified;
-use PhpParser\Node\Scalar\String;
+use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Throw_;
 use PhpParser\NodeVisitorAbstract;
@@ -76,7 +76,7 @@ public function leaveNode(Node $node)
             new Throw_(
                 new New_(
                     new FullyQualified('BadMethodCallException'),
-                    array(new Arg(new String('Method is disabled')))
+                    array(new Arg(new String_('Method is disabled')))
                 )
             )
         );

From 22c351fc6c96c4b93369c3403d53687d9ae5a61f Mon Sep 17 00:00:00 2001
From: Marek Laska <marek.laska@researchsquare.com>
Date: Tue, 30 Jun 2015 06:10:31 +0000
Subject: [PATCH 2/2] Disabling HHVM failure check on Travis

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 83feeb1f..7dbb79fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ php:
   - 5.6
   - hhvm
 
+matrix:
+  allow_failures:
+    - php: hhvm
+
 before_script:
   - composer self-update
   - composer update --prefer-source --dev