Don't extend depcreated interfaces - do it the other way around

Icinga · Mar 12, 2020 · 89b5e94 · 89b5e94
1 parent 24272f1
commit 89b5e94
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 68 deletions.
diff --git a/src/Contract/Paginatable.php b/src/Contract/Paginatable.php
@@ -2,6 +2,55 @@
 
 namespace ipl\Stdlib\Contract;
 
-interface Paginatable extends PaginationInterface
+use Countable;
+
+interface Paginatable extends Countable
 {
+    /**
+     * Get whether a limit is set
+     *
+     * @return bool
+     */
+    public function hasLimit();
+
+    /**
+     * Get the limit
+     *
+     * @return int|null
+     */
+    public function getLimit();
+
+    /**
+     * Set the limit
+     *
+     * @param int|null $limit Maximum number of items to return. If you want to disable the limit,
+     *                        it is best practice to use null or a negative value
+     *
+     * @return $this
+     */
+    public function limit($limit);
+
+    /**
+     * Get whether an offset is set
+     *
+     * @return bool
+     */
+    public function hasOffset();
+
+    /**
+     * Get the offset
+     *
+     * @return int|null
+     */
+    public function getOffset();
+
+    /**
+     * Set the offset
+     *
+     * @param int|null $offset Start result set after this many rows. If you want to disable the offset,
+     *                         it is best practice to use null or a negative value
+     *
+     * @return $this
+     */
+    public function offset($offset);
 }
diff --git a/src/Contract/PaginationInterface.php b/src/Contract/PaginationInterface.php
@@ -2,56 +2,7 @@
 
 namespace ipl\Stdlib\Contract;
 
-use Countable;
-
 /** @deprecated Use {@link Paginatable} instead */
-interface PaginationInterface extends Countable
+interface PaginationInterface extends Paginatable
 {
-    /**
-     * Get whether a limit is set
-     *
-     * @return bool
-     */
-    public function hasLimit();
-
-    /**
-     * Get the limit
-     *
-     * @return int|null
-     */
-    public function getLimit();
-
-    /**
-     * Set the limit
-     *
-     * @param int|null $limit Maximum number of items to return. If you want to disable the limit,
-     *                        it is best practice to use null or a negative value
-     *
-     * @return $this
-     */
-    public function limit($limit);
-
-    /**
-     * Get whether an offset is set
-     *
-     * @return bool
-     */
-    public function hasOffset();
-
-    /**
-     * Get the offset
-     *
-     * @return int|null
-     */
-    public function getOffset();
-
-    /**
-     * Set the offset
-     *
-     * @param int|null $offset Start result set after this many rows. If you want to disable the offset,
-     *                         it is best practice to use null or a negative value
-     *
-     * @return $this
-     */
-    public function offset($offset);
 }
diff --git a/src/Contract/Validator.php b/src/Contract/Validator.php
@@ -2,6 +2,21 @@
 
 namespace ipl\Stdlib\Contract;
 
-interface Validator extends ValidatorInterface
+interface Validator
 {
+    /**
+     * Get whether the given value is valid
+     *
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    public function isValid($value);
+
+    /**
+     * Get the validation error messages
+     *
+     * @return array
+     */
+    public function getMessages();
 }
diff --git a/src/Contract/ValidatorInterface.php b/src/Contract/ValidatorInterface.php
@@ -3,21 +3,6 @@
 namespace ipl\Stdlib\Contract;
 
 /** @deprecated Use {@link Validator} instead */
-interface ValidatorInterface
+interface ValidatorInterface extends Validator
 {
-    /**
-     * Get whether the given value is valid
-     *
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    public function isValid($value);
-
-    /**
-     * Get the validation error messages
-     *
-     * @return array
-     */
-    public function getMessages();
 }