-
-
Notifications
You must be signed in to change notification settings - Fork 877
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(metadata): interface breaking in 3.2 (#5883)
To ease subtree split we move the `Api` to `Metadata` namespace.
- Loading branch information
Showing
40 changed files
with
568 additions
and
269 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,44 @@ | |
|
||
namespace ApiPlatform\Api; | ||
|
||
interface FilterInterface extends \ApiPlatform\Metadata\FilterInterface | ||
/** | ||
* Filters applicable on a resource. | ||
* | ||
* @author Kévin Dunglas <[email protected]> | ||
*/ | ||
interface FilterInterface | ||
{ | ||
/** | ||
* Gets the description of this filter for the given resource. | ||
* | ||
* Returns an array with the filter parameter names as keys and array with the following data as values: | ||
* - property: the property where the filter is applied | ||
* - type: the type of the filter | ||
* - required: if this filter is required | ||
* - strategy (optional): the used strategy | ||
* - is_collection (optional): if this filter is for collection | ||
* - swagger (optional): additional parameters for the path operation, | ||
* e.g. 'swagger' => [ | ||
* 'description' => 'My Description', | ||
* 'name' => 'My Name', | ||
* 'type' => 'integer', | ||
* ] | ||
* - openapi (optional): additional parameters for the path operation in the version 3 spec, | ||
* e.g. 'openapi' => [ | ||
* 'description' => 'My Description', | ||
* 'name' => 'My Name', | ||
* 'schema' => [ | ||
* 'type' => 'integer', | ||
* ] | ||
* ] | ||
* - schema (optional): schema definition, | ||
* e.g. 'schema' => [ | ||
* 'type' => 'string', | ||
* 'enum' => ['value_1', 'value_2'], | ||
* ] | ||
* The description can contain additional data specific to a filter. | ||
* | ||
* @see \ApiPlatform\OpenApi\Factory\OpenApiFactory::getFiltersParameters | ||
*/ | ||
public function getDescription(string $resourceClass): array; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,15 +13,20 @@ | |
|
||
namespace ApiPlatform\Api; | ||
|
||
class_exists(\ApiPlatform\Metadata\IdentifiersExtractorInterface::class); | ||
use ApiPlatform\Metadata\Exception\RuntimeException; | ||
use ApiPlatform\Metadata\Operation; | ||
|
||
class_alias( | ||
\ApiPlatform\Metadata\IdentifiersExtractorInterface::class, | ||
__NAMESPACE__.'\IdentifiersExtractorInterface' | ||
); | ||
|
||
if (false) { // @phpstan-ignore-line | ||
interface IdentifiersExtractorInterface extends \ApiPlatform\Metadata\IdentifiersExtractorInterface | ||
{ | ||
} | ||
/** | ||
* Extracts identifiers for a given Resource according to the retrieved Metadata. | ||
* | ||
* @author Antoine Bluchet <[email protected]> | ||
*/ | ||
interface IdentifiersExtractorInterface | ||
{ | ||
/** | ||
* Finds identifiers from an Item (object). | ||
* | ||
* @throws RuntimeException | ||
*/ | ||
public function getIdentifiersFromItem(object $item, Operation $operation = null, array $context = []): array; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,15 +13,33 @@ | |
|
||
namespace ApiPlatform\Api; | ||
|
||
class_exists(\ApiPlatform\Metadata\IriConverterInterface::class); | ||
use ApiPlatform\Metadata\Exception\InvalidArgumentException; | ||
use ApiPlatform\Metadata\Exception\ItemNotFoundException; | ||
use ApiPlatform\Metadata\Exception\RuntimeException; | ||
use ApiPlatform\Metadata\Operation; | ||
|
||
class_alias( | ||
\ApiPlatform\Metadata\IriConverterInterface::class, | ||
__NAMESPACE__.'\IriConverterInterface' | ||
); | ||
/** | ||
* Converts item and resources to IRI and vice versa. | ||
* | ||
* @author Kévin Dunglas <[email protected]> | ||
*/ | ||
interface IriConverterInterface | ||
{ | ||
/** | ||
* Retrieves an item from its IRI. | ||
* | ||
* @throws InvalidArgumentException | ||
* @throws ItemNotFoundException | ||
*/ | ||
public function getResourceFromIri(string $iri, array $context = [], Operation $operation = null): object; | ||
|
||
if (false) { // @phpstan-ignore-line | ||
interface IriConverterInterface extends \ApiPlatform\Metadata\IriConverterInterface | ||
{ | ||
} | ||
/** | ||
* Gets the IRI associated with the given item. | ||
* | ||
* @param object|class-string $resource | ||
* | ||
* @throws InvalidArgumentException | ||
* @throws RuntimeException | ||
*/ | ||
public function getIriFromResource(object|string $resource, int $referenceType = UrlGeneratorInterface::ABS_PATH, Operation $operation = null, array $context = []): ?string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,10 +13,27 @@ | |
|
||
namespace ApiPlatform\Api; | ||
|
||
class_exists(\ApiPlatform\Metadata\ResourceClassResolverInterface::class); | ||
use ApiPlatform\Metadata\Exception\InvalidArgumentException; | ||
|
||
if (false) { // @phpstan-ignore-line | ||
interface ResourceClassResolverInterface extends \ApiPlatform\Metadata\ResourceClassResolverInterface | ||
{ | ||
} | ||
/** | ||
* Guesses which resource is associated with a given object. | ||
* | ||
* @author Kévin Dunglas <[email protected]> | ||
*/ | ||
interface ResourceClassResolverInterface | ||
{ | ||
/** | ||
* Guesses the associated resource. | ||
* | ||
* @param string $resourceClass The expected resource class | ||
* @param bool $strict If true, value must match the expected resource class | ||
* | ||
* @throws InvalidArgumentException | ||
*/ | ||
public function getResourceClass(mixed $value, string $resourceClass = null, bool $strict = false): string; | ||
|
||
/** | ||
* Is the given class a resource class? | ||
*/ | ||
public function isResourceClass(string $type): bool; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,15 +13,24 @@ | |
|
||
namespace ApiPlatform\Api; | ||
|
||
class_exists(\ApiPlatform\Metadata\UriVariablesConverterInterface::class); | ||
use ApiPlatform\Metadata\Exception\InvalidIdentifierException; | ||
|
||
class_alias( | ||
\ApiPlatform\Metadata\UriVariablesConverterInterface::class, | ||
__NAMESPACE__.'\UriVariablesConverterInterface' | ||
); | ||
|
||
if (false) { // @phpstan-ignore-line | ||
interface UriVariablesConverterInterface extends \ApiPlatform\Metadata\UriVariablesConverterInterface | ||
{ | ||
} | ||
/** | ||
* Identifier converter. | ||
* | ||
* @author Antoine Bluchet <[email protected]> | ||
*/ | ||
interface UriVariablesConverterInterface | ||
{ | ||
/** | ||
* Takes an array of strings representing URI variables (identifiers) and transform their values to the expected type. | ||
* | ||
* @param array $data URI variables to convert to PHP values | ||
* @param string $class The class to which the URI variables belong to | ||
* | ||
* @throws InvalidIdentifierException | ||
* | ||
* @return array Array indexed by identifiers properties with their values denormalized | ||
*/ | ||
public function convert(array $data, string $class, array $context = []): array; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,13 +13,72 @@ | |
|
||
namespace ApiPlatform\Api; | ||
|
||
class_alias( | ||
\ApiPlatform\Metadata\UrlGeneratorInterface::class, | ||
__NAMESPACE__.'\UrlGeneratorInterface' | ||
); | ||
|
||
if (false) { // @phpstan-ignore-line | ||
interface UrlGeneratorInterface extends \ApiPlatform\Metadata\UrlGeneratorInterface | ||
{ | ||
} | ||
use Symfony\Component\Routing\Exception\InvalidParameterException; | ||
use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; | ||
use Symfony\Component\Routing\Exception\RouteNotFoundException; | ||
|
||
/** | ||
* UrlGeneratorInterface is the interface that all URL generator classes must implement. | ||
* | ||
* This interface has been imported and adapted from the Symfony project. | ||
* | ||
* The constants in this interface define the different types of resource references that | ||
* are declared in RFC 3986: http://tools.ietf.org/html/rfc3986 | ||
* We are using the term "URL" instead of "URI" as this is more common in web applications | ||
* and we do not need to distinguish them as the difference is mostly semantical and | ||
* less technical. Generating URIs, i.e. representation-independent resource identifiers, | ||
* is also possible. | ||
* | ||
* @author Fabien Potencier <[email protected]> | ||
* @author Tobias Schultze <http://tobion.de> | ||
* @copyright Fabien Potencier | ||
*/ | ||
interface UrlGeneratorInterface | ||
{ | ||
/** | ||
* Generates an absolute URL, e.g. "http://example.com/dir/file". | ||
*/ | ||
public const ABS_URL = 0; | ||
|
||
/** | ||
* Generates an absolute path, e.g. "/dir/file". | ||
*/ | ||
public const ABS_PATH = 1; | ||
|
||
/** | ||
* Generates a relative path based on the current request path, e.g. "../parent-file". | ||
* | ||
* @see UrlGenerator::getRelativePath() | ||
*/ | ||
public const REL_PATH = 2; | ||
|
||
/** | ||
* Generates a network path, e.g. "//example.com/dir/file". | ||
* Such reference reuses the current scheme but specifies the host. | ||
*/ | ||
public const NET_PATH = 3; | ||
|
||
/** | ||
* Generates a URL or path for a specific route based on the given parameters. | ||
* | ||
* Parameters that reference placeholders in the route pattern will substitute them in the | ||
* path or host. Extra params are added as query string to the URL. | ||
* | ||
* When the passed reference type cannot be generated for the route because it requires a different | ||
* host or scheme than the current one, the method will return a more comprehensive reference | ||
* that includes the required params. For example, when you call this method with $referenceType = ABSOLUTE_PATH | ||
* but the route requires the https scheme whereas the current scheme is http, it will instead return an | ||
* ABSOLUTE_URL with the https scheme and the current host. This makes sure the generated URL matches | ||
* the route in any case. | ||
* | ||
* If there is no route with the given name, the generator must throw the RouteNotFoundException. | ||
* | ||
* The special parameter _fragment will be used as the document fragment suffixed to the final URL. | ||
* | ||
* @throws RouteNotFoundException If the named route doesn't exist | ||
* @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route | ||
* @throws InvalidParameterException When a parameter value for a placeholder is not correct because | ||
* it does not match the requirement | ||
*/ | ||
public function generate(string $name, array $parameters = [], int $referenceType = self::ABS_PATH): string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.