Merge pull request #12 from sroehrl/release/0.3.6

BUGFIX & testsuite
sroehrl · Oct 26, 2022 · b35975a · b35975a
2 parents 3eecddd + b2188b7
commit b35975a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+test/report
diff --git a/DbOps.php b/DbOps.php
@@ -80,19 +80,19 @@ private function prepareBinding($value, $type): array
      * @param bool $set
      * @param bool $prepared
      *
-     * @return mixed
+     * @return string
      * @throws DbException
      */
-    protected function operandi($input, bool $set, bool $prepared)
+    protected function operandi($input, bool $set, bool $prepared): string
     {
         switch (gettype($input)){
             case 'integer':
-                return $input;
+                return ' = ' . $input;
             case 'NULL':
-                return $this->setNull($input, $set);
+                return $this->setNull($set);
         }
         if (empty($input)) {
-            return $this->setNull($input, $set);
+            return $this->setNull($set);
         }
         $firstLetter = strtolower(substr($input, 0, 1));
         switch ($firstLetter) {
@@ -139,7 +139,7 @@ protected function operandi($input, bool $set, bool $prepared)
                 break;
             default:
                 if (strtolower($input) == 'null') {
-                    $return = ($set ? ' = NULL' : ' IS NULL');
+                    $return = $this->setNull($set);
                 } elseif ($prepared) {
                     $return = preg_match('/%/', $input) ? ' LIKE ? ' : ' = ? ';
                     $this->addExclusion($input);
@@ -151,7 +151,7 @@ protected function operandi($input, bool $set, bool $prepared)
         return $return;
     }
 
-    protected function setNull($value, bool $set): string
+    protected function setNull(bool $set): string
     {
         return ($set ? ' = NULL' : ' IS NULL');
     }

diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         stderr="true"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./</directory>
+        </include>
+        <exclude>
+            <directory>./test</directory>
+            <directory>./vendor</directory>
+            <directory>./.github</directory>
+            <directory suffix="Test.php">./</directory>
+        </exclude>
+        <report>
+            <clover outputFile="test/clover.xml"/>
+            <html outputDirectory="test/report"/>
+        </report>
+    </coverage>
+    <testsuites>
+        <testsuite name="unit">
+            <directory suffix="Test.php">./test</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <const name="base" value="http://localhost"/>
+    </php>
+    <logging/>
+</phpunit>