Split setConfig() into setConfig(), addConfig() and removeConfig()

Author: erayd

src/JsonSchema/Constraints/Factory.php

@@ -83,33 +83,46 @@ public function __construct(
     /**
      * Set config values
      *
-     * @param int $checkMode Set checkMode options
-     * @param bool $enable Whether to enable or disable the provided options. If null, overwrites checkMode.
+     * @param int $checkMode Set checkMode options - does not preserve existing flags
      */
-    public function setConfig($checkMode = Constraint::CHECK_MODE_NORMAL, $enable = null)
+    public function setConfig($checkMode = Constraint::CHECK_MODE_NORMAL)
     {
-        if ($enable === null) {
-            $this->checkMode = $checkMode;
-        } elseif ($enable) {
-            $this->checkMode |= $checkMode;
-        } else {
-            $this->checkMode &= ~$checkMode;
-        }
+        $this->checkMode = $checkMode;
+    }
+
+    /**
+     * Enable checkMode flags
+     *
+     * @param int $options
+     */
+    public function addConfig($options)
+    {
+        $this->checkMode |= $options;
+    }
+
+    /**
+     * Disable checkMode flags
+     *
+     * @param int $options
+     */
+    public function removeConfig($options)
+    {
+        $this->checkMode &= ~$options;
     }
 
     /**
      * Get checkMode option
      *
-     * @param int $checkMode Mode to get, if null then return entire bitmask
+     * @param int $options Options to get, if null then return entire bitmask
      *
      * @return int
      */
-    public function getConfig($checkMode = null)
+    public function getConfig($options = null)
     {
-        if ($checkMode === null) {
+        if ($options === null) {
             return $this->checkMode;
         }
-        return ($this->checkMode & $checkMode);
+        return ($this->checkMode & $options);
     }
 
     /**

tests/Constraints/FactoryTest.php

@@ -126,14 +126,14 @@ public function testCheckMode()
         $this->assertEquals(Constraint::CHECK_MODE_COERCE_TYPES, $f->getConfig());
 
         // test adding config
-        $f->setConfig(Constraint::CHECK_MODE_NORMAL, true);
+        $f->addConfig(Constraint::CHECK_MODE_NORMAL);
         $this->assertEquals(Constraint::CHECK_MODE_NORMAL | Constraint::CHECK_MODE_COERCE_TYPES, $f->getConfig());
 
         // test getting filtered config
         $this->assertEquals(Constraint::CHECK_MODE_NORMAL, $f->getConfig(Constraint::CHECK_MODE_NORMAL));
 
         // test removing config
-        $f->setConfig(Constraint::CHECK_MODE_COERCE_TYPES, false);
+        $f->removeConfig(Constraint::CHECK_MODE_COERCE_TYPES);
         $this->assertEquals(Constraint::CHECK_MODE_NORMAL, $f->getConfig());
 
         // test resetting to defaults