From 1157ce017f8bdcfdd6214202ddeafed29918d3e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Oct 2019 14:54:00 +0200
Subject: add upstream patches for 1946 and 1949

---
 650708de9df9039f04eda0fc150bd94e5a5b9753.patch | 35 ++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 650708de9df9039f04eda0fc150bd94e5a5b9753.patch

(limited to '650708de9df9039f04eda0fc150bd94e5a5b9753.patch')

diff --git a/650708de9df9039f04eda0fc150bd94e5a5b9753.patch b/650708de9df9039f04eda0fc150bd94e5a5b9753.patch
new file mode 100644
index 0000000..fd81576
--- /dev/null
+++ b/650708de9df9039f04eda0fc150bd94e5a5b9753.patch
@@ -0,0 +1,35 @@
+From 650708de9df9039f04eda0fc150bd94e5a5b9753 Mon Sep 17 00:00:00 2001
+From: Serghei Iakovlev <sadhooklay@gmail.com>
+Date: Fri, 4 Oct 2019 15:39:16 +0300
+Subject: [PATCH] Fixed tests to be able run full test suite without Phalcon
+
+---
+ CHANGELOG.md                                 | 2 ++
+ unit-tests/Extension/InternalClassesTest.php | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/unit-tests/Extension/InternalClassesTest.php b/unit-tests/Extension/InternalClassesTest.php
+index 6333a8666..d5caee8e5 100644
+--- a/unit-tests/Extension/InternalClassesTest.php
++++ b/unit-tests/Extension/InternalClassesTest.php
+@@ -20,12 +20,20 @@ class InternalClassesTest extends TestCase
+ {
+     public function testStaticMethodCall()
+     {
++        if (false === class_exists(Di::class)) {
++            $this->markTestSkipped('Class Phalcon\Di not found');
++        }
++
+         $class = new InternalClasses();
+         $this->assertSame(Di::getDefault(), $class->testStaticCall());
+     }
+ 
+     public function testStaticPropertyFetch()
+     {
++        if (false === class_exists(Query::class)) {
++            $this->markTestSkipped('Class Phalcon\Mvc\Model\Query not found');
++        }
++
+         $class = new InternalClasses();
+         $this->assertSame(Query::TYPE_DELETE, $class->testStaticPropertyFetch());
+     }
-- 
cgit