fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3274

Browse Source 
Fix wrong phpunit merge
Fix System to PmSystem
This commit is contained in:
davidcallizaya
2017-08-10 22:54:59 -04:00
parent 01b745203d
commit 71c7ef11ab
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpunit.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false" <phpunit backupGlobals="false"
backupStaticAttributes="false" backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true" colors="true"
convertErrorsToExceptions="true" convertErrorsToExceptions="true"
convertNoticesToExceptions="false" convertNoticesToExceptions="false"
@@ -15,7 +14,10 @@
<testsuite name="workflow"> <testsuite name="workflow">
<directory>./tests/workflow/engine/src/</directory> <directory>./tests/workflow/engine/src/</directory>
</testsuite> </testsuite>
</testsuites> <testsuite name="Unit">
<directory suffix="Test.php">./tests/Unit</directory>
</testsuite>
</testsuites>
<filter> <filter>
<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="false"> <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="false">
@@ -45,18 +47,4 @@
<var name="HTTPS" value="off" /> <var name="HTTPS" value="off" />
<var name="SERVER_PORT" value="8080" /> <var name="SERVER_PORT" value="8080" />
</php> </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> </phpunit>

4
workflow/engine/src/ProcessMaker/BusinessModel/Skins.php
View File

@@ -1,7 +1,7 @@
<?php <?php
namespace ProcessMaker\BusinessModel; namespace ProcessMaker\BusinessModel;
use System; use PmSystem;
use Exception; use Exception;
use G; use G;
@@ -18,7 +18,7 @@ class Skins
*/ */
public function getSkins() public function getSkins()
{ {
$list = System::getSkingList(); $list = PmSystem::getSkingList();
return $list['skins']; return $list['skins'];
} }