PHPLIB-462: Add compatibility layer for constraint changes

Author: alcaeus

tests/SpecTests/DocumentsMatchConstraint.php

@@ -9,6 +9,7 @@
 use InvalidArgumentException;
 use RuntimeException;
 use stdClass;
+use Symfony\Bridge\PhpUnit\ConstraintTrait;
 
 /**
  * Constraint that checks if one document matches another.
@@ -17,6 +18,8 @@
  */
 class DocumentsMatchConstraint extends Constraint
 {
+    use ConstraintTrait;
+
     private $ignoreExtraKeysInRoot = false;
     private $ignoreExtraKeysInEmbedded = false;
     private $placeholders = [];
@@ -38,50 +41,12 @@ class DocumentsMatchConstraint extends Constraint
      */
     public function __construct($value, $ignoreExtraKeysInRoot = false, $ignoreExtraKeysInEmbedded = false, array $placeholders = [])
     {
-        parent::__construct();
         $this->value = $this->prepareBSON($value, true, $this->sortKeys);
         $this->ignoreExtraKeysInRoot = $ignoreExtraKeysInRoot;
         $this->ignoreExtraKeysInEmbedded = $ignoreExtraKeysInEmbedded;
         $this->placeholders = $placeholders;
     }
 
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'matches ' . json_encode($this->value);
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param mixed $other
-     * @return boolean
-     */
-    protected function matches($other)
-    {
-        /* TODO: If ignoreExtraKeys and sortKeys are both false, then we may be
-         * able to skip preparation, convert both documents to extended JSON,
-         * and compare strings.
-         *
-         * If ignoreExtraKeys is false and sortKeys is true, we still be able to
-         * compare JSON strings but will still require preparation to sort keys
-         * in all documents and sub-documents. */
-        $other = $this->prepareBSON($other, true, $this->sortKeys);
-
-        try {
-            $this->assertEquals($this->value, $other, $this->ignoreExtraKeysInRoot);
-        } catch (RuntimeException $e) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Compares two documents recursively.
      *
@@ -131,6 +96,31 @@ private function assertEquals(ArrayObject $expected, ArrayObject $actual, $ignor
         }
     }
 
+    private function doMatches($other)
+    {
+        /* TODO: If ignoreExtraKeys and sortKeys are both false, then we may be
+         * able to skip preparation, convert both documents to extended JSON,
+         * and compare strings.
+         *
+         * If ignoreExtraKeys is false and sortKeys is true, we still be able to
+         * compare JSON strings but will still require preparation to sort keys
+         * in all documents and sub-documents. */
+        $other = $this->prepareBSON($other, true, $this->sortKeys);
+
+        try {
+            $this->assertEquals($this->value, $other, $this->ignoreExtraKeysInRoot);
+        } catch (RuntimeException $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function doToString()
+    {
+        return 'matches ' . json_encode($this->value);
+    }
+
     /**
      * Prepare a BSON document or array for comparison.
      *