Improve duplicate enqueue detection logic

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.3.5] - 2020-01-11
+### Fixed
+- Improve duplicate enqueue detection logic.
+
 ## [0.3.4] - 2020-01-11
 ### Fixed
 - Fix abstract handler method access.
@@ -95,6 +99,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Initial release to GitHub.
 
+[0.3.5]: https://github.com/brightnucleus/dependencies/compare/v0.3.4...v0.3.5
 [0.3.4]: https://github.com/brightnucleus/dependencies/compare/v0.3.3...v0.3.4
 [0.3.3]: https://github.com/brightnucleus/dependencies/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/brightnucleus/dependencies/compare/v0.3.1...v0.3.2

src/AbstractDependencyHandler.php

@@ -59,6 +59,11 @@ abstract protected function get_register_function();
 	 *                                  called.
 	 */
 	public function enqueue( $args = null ) {
+		if ( array_key_exists( 'handle', $args )
+		     && $this->is_enqueued( $args['handle'] ) ) {
+			return;
+		}
+
 		$this->invokeFunction( $this->get_enqueue_function(), (array) $args );
 	}
 
@@ -81,6 +86,10 @@ abstract protected function get_enqueue_function();
 	 * @return bool Whether the handle was found or not.
 	 */
 	public function maybe_enqueue( $handle ) {
+		if ( $this->is_enqueued( $handle ) ) {
+			return true;
+		}
+
 		if ( $this->is_registered( $handle ) ) {
 			$enqueue = $this->get_enqueue_function();
 			$enqueue( $handle );

src/DependencyManager.php

@@ -230,11 +230,6 @@ public function enqueue( $context = null ) {
 	 * @return bool Returns whether the handle was found or not.
 	 */
 	public function enqueue_handle( $handle, $context = null, $fallback = false ) {
-		$handler = $this->handlers[ $context['dependency_type'] ];
-		if ( $handler->is_enqueued( $handle ) ) {
-			return true;
-		}
-
 		if ( ! $this->enqueue_internal_handle( $handle, $context ) ) {
 			return $this->enqueue_fallback_handle( $handle );
 		}
@@ -260,6 +255,13 @@ protected function enqueue_internal_handle( $handle, $context = null ) {
 			return false;
 		}
 
+		$handler = array_key_exists( $dependency_type, $this->handlers )
+			? $this->handlers[ $dependency_type ]
+			: null;
+		if ( $handler && $handler->is_enqueued( $handle ) ) {
+			return true;
+		}
+
 		$this->enqueue_dependency(
 			$dependency,
 			$handle,