Code review changes

src/Uplink/Auth/Provider.php

@@ -11,6 +11,7 @@
 use StellarWP\Uplink\Config;
 use StellarWP\Uplink\Contracts\Abstract_Provider;
 use StellarWP\Uplink\Pipeline\Pipeline;
+use StellarWP\Uplink\Resources\Collection;
 
 final class Provider extends Abstract_Provider {
 
@@ -25,7 +26,7 @@ public function register() {
 		$this->container->bind(
 			Token_Manager::class,
 			static function ( $c ) {
-				return new Token\Token_Manager( $c->get( Config::TOKEN_OPTION_NAME ) );
+				return new Token\Token_Manager( $c->get( Config::TOKEN_OPTION_NAME ), $c->get( Collection::class ) );
 			}
 		);
 

src/Uplink/Auth/Token/Contracts/Token_Manager.php

@@ -46,6 +46,15 @@ public function store( string $token, string $slug = '' ): bool;
 	 */
 	public function get( string $slug = '' ): ?string;
 
+	/**
+	 * Retrieve all store tokens, indexed by their slug.
+	 *
+	 * @since TBD
+	 *
+	 * @return array<string, string>|array{}
+	 */
+	public function get_all(): ?array;
+
 	/**
 	 * Deletes the token from the database.
 	 *

src/Uplink/Auth/Token/Token_Manager.php

@@ -23,17 +23,27 @@
 	 */
 	protected $option_name;
 
+	/**
+	 * Resources collection
+	 *
+	 * @since TBD
+	 *
+	 * @var Collection
+	 */
+	protected $collection;
+
 	/**
 	 * @param  string  $option_name  The option name as set via Config::set_token_auth_prefix().
 	 */
-	public function __construct( string $option_name ) {
+	public function __construct( string $option_name, Collection $collection ) {
 		if ( ! $option_name ) {
 			throw new InvalidArgumentException(
 				__( 'You must set a token prefix with StellarWP\Uplink\Config::set_token_auth_prefix() before using the token manager.', '%TEXTDOMAIN%' )
 			);
 		}
 
 		$this->option_name = $option_name;
+		$this->collection  = $collection;
 	}
 
 	/**
@@ -73,6 +83,8 @@
 			return false;
 		}
 
+		codecept_debug( $slug );
+
 		$slug = $this->validate_slug( $slug );
 
 		$current_value = $this->get( $slug );
@@ -82,15 +94,14 @@
 			return true;
 		}
 
-		$data = $this->get_all();
+		$values = $this->get_all();
 
-		if ( ! is_array( $data ) ) {
-			$data = [];
-		}
+		$values[ $slug ] = $token;
 
-		$data[ $slug ] = $token;
+		codecept_debug( $values );
+		codecept_debug( $slug );
 
-		return update_network_option( get_current_network_id(), $this->option_name, $data );
+		return update_network_option( get_current_network_id(), $this->option_name, $values );
 	}
 
 	/**
@@ -105,33 +116,28 @@
 	public function get( string $slug = '' ): ?string {
 		$slug = $this->validate_slug( $slug );
 
-		$value = get_network_option( get_current_network_id(), $this->option_name, null );
+		$values = $this->get_all();
 
-		if ( ! $value ) {
+		if ( ! $values ) {
 			return null;
 		}
 
 		if ( ! $slug ) {
-			return is_string( $value ) ? $value : ( array_values( $value )[0] ?? null );
-		}
-
-		if ( is_string( $value ) ) {
-			// Still using old structure, lets return whatever we found.
-			return $value;
+			return array_values( $values )[0] ?? null;
 		}
 
-		return $value[ $slug ] ?? null;
+		return $values[ $slug ] ?? null;
 	}
 
 	/**
 	 * Get all the tokens.
 	 *
 	 * @since TBD
 	 *
-	 * @return null|string|array
+	 * @return array<string, string>|array{}
 	 */
-	public function get_all() {
-		return get_network_option( get_current_network_id(), $this->option_name, [] );
+	public function get_all(): ?array {
+		return (array) get_network_option( get_current_network_id(), $this->option_name, [] );
 	}
 
 	/**
@@ -142,7 +148,7 @@
 	public function delete( string $slug = '' ): bool {
 		$current_value = $this->get_all();
 		// Already doesn't exist, WordPress would normally return false.
-		if ( $current_value === null ) {
+		if ( ! $current_value ) {
 			return true;
 		}
 
@@ -171,6 +177,6 @@
 	 * @return string
 	 */
 	protected function validate_slug( string $slug = '' ): string {
-		return $slug && Config::get_container()->get( Collection::class )->offsetExists( $slug ) ? $slug : '';
+		return $slug && $this->collection->offsetExists( $slug ) ? $slug : '';
 	}
 }