From 71c7ef11ab871104af803c3ae34f21e1091cc57e Mon Sep 17 00:00:00 2001
From: davidcallizaya <david.callizaya@processmaker.com>
Date: Thu, 10 Aug 2017 22:54:59 -0400
Subject: [PATCH] HOR-3274 Fix wrong phpunit merge Fix System to PmSystem

---
 phpunit.xml                                   | 20 ++++---------------
 .../src/ProcessMaker/BusinessModel/Skins.php  |  4 ++--
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 742892c63..241fcb099 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="false"
@@ -15,7 +14,10 @@
         <testsuite name="workflow">
             <directory>./tests/workflow/engine/src/</directory>
         </testsuite>
-    </testsuites>
+        <testsuite name="Unit">
+          <directory suffix="Test.php">./tests/Unit</directory>
+        </testsuite>
+  </testsuites>
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="false">
@@ -45,18 +47,4 @@
         <var name="HTTPS" value="off" />
         <var name="SERVER_PORT" value="8080" />
     </php>
-
-    <testsuite name="Unit">
-      <directory suffix="Test.php">./tests/Unit</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">./app</directory>
-    </whitelist>
-  </filter>
-  <php>
-    <env name="APP_ENV" value="testing"/>
-    <env name="CACHE_DRIVER" value="array"/>
-  </php>
 </phpunit>
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php b/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php
index afd286ce4..f9f17d759 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Skins.php
@@ -1,7 +1,7 @@
 <?php
 namespace ProcessMaker\BusinessModel;
 
-use System;
+use PmSystem;
 use Exception;
 use G;
 
@@ -18,7 +18,7 @@ class Skins
      */
     public function getSkins()
     {
-        $list = System::getSkingList();
+        $list = PmSystem::getSkingList();
         return $list['skins'];
     }