avoid deprecated json_array type

zf-fr · Oct 17, 2022 · 151c61f · 151c61f
1 parent f017c3f
commit 151c61f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/config/doctrine/ZfrOAuth2.Server.Model.AbstractToken.dcm.xml b/config/doctrine/ZfrOAuth2.Server.Model.AbstractToken.dcm.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
   <mapped-superclass name="ZfrOAuth2\Server\Model\AbstractToken">
     <cache usage="READ_ONLY" region="oauth_token_region"/>
     <id name="token" type="string" length="40"/>
     <field name="expiresAt" type="datetime" nullable="false" column="expires_at"/>
-    <field name="scopes" type="json_array" nullable="false"/>
+    <field name="scopes" type="json" nullable="false"/>
     <many-to-one field="client" target-entity="ZfrOAuth2\Server\Model\Client">
       <join-columns>
         <join-column name="client_id" referenced-column-name="id"/>

diff --git a/config/doctrine/ZfrOAuth2.Server.Model.AccessToken.dcm.xml b/config/doctrine/ZfrOAuth2.Server.Model.AccessToken.dcm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="ZfrOAuth2\Server\Model\AccessToken" extends="ZfrOAuth2\Server\Model\AbstractToken" repository-class="ZfrOAuth2\Server\Repository\AccessTokenRepositoryInterface" table="oauth_access_tokens">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+  <entity name="ZfrOAuth2\Server\Model\AccessToken" repository-class="ZfrOAuth2\Server\Repository\AccessTokenRepositoryInterface" table="oauth_access_tokens">
     <attribute-overrides>
       <attribute-override name="expiresAt">
         <field nullable="true"/>

diff --git a/config/doctrine/ZfrOAuth2.Server.Model.AuthorizationCode.dcm.xml b/config/doctrine/ZfrOAuth2.Server.Model.AuthorizationCode.dcm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="ZfrOAuth2\Server\Model\AuthorizationCode" extends="ZfrOAuth2\Server\Model\AbstractToken" repository-class="ZfrOAuth2\Server\Repository\AuthorizationCodeRepositoryInterface" table="oauth_authorization_codes">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+  <entity name="ZfrOAuth2\Server\Model\AuthorizationCode" repository-class="ZfrOAuth2\Server\Repository\AuthorizationCodeRepositoryInterface" table="oauth_authorization_codes">
     <field name="redirectUri" type="string" length="1000" nullable="false" column="redirect_uri"/>
   </entity>
 </doctrine-mapping>
diff --git a/config/doctrine/ZfrOAuth2.Server.Model.Client.dcm.xml b/config/doctrine/ZfrOAuth2.Server.Model.Client.dcm.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
   <entity name="ZfrOAuth2\Server\Model\Client" repository-class="ZfrOAuth2\Server\Repository\ClientRepositoryInterface" table="oauth_clients">
     <id name="id" type="string" length="36"/>
     <field name="name" type="string" length="60" nullable="false"/>
     <field name="secret" type="string" length="60" nullable="false"/>
-    <field name="redirectUris" type="json_array" nullable="false" column="redirect_uris"/>
-    <field name="scopes" type="json_array" nullable="false">
+    <field name="redirectUris" type="json" nullable="false" column="redirect_uris"/>
+    <field name="scopes" type="json" nullable="false">
       <options>
         <option name="default">[]</option>
       </options>

diff --git a/config/doctrine/ZfrOAuth2.Server.Model.RefreshToken.dcm.xml b/config/doctrine/ZfrOAuth2.Server.Model.RefreshToken.dcm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="ZfrOAuth2\Server\Model\RefreshToken" extends="ZfrOAuth2\Server\Model\AbstractToken" repository-class="ZfrOAuth2\Server\Repository\AccessTokenRepositoryInterface" table="oauth_refresh_tokens">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+  <entity name="ZfrOAuth2\Server\Model\RefreshToken" repository-class="ZfrOAuth2\Server\Repository\AccessTokenRepositoryInterface" table="oauth_refresh_tokens">
     <attribute-overrides>
       <attribute-override name="expiresAt">
         <field nullable="true"/>

diff --git a/config/doctrine/ZfrOAuth2.Server.Model.Scope.dcm.xml b/config/doctrine/ZfrOAuth2.Server.Model.Scope.dcm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
   <entity name="ZfrOAuth2\Server\Model\Scope" repository-class="ZfrOAuth2\Server\Repository\ScopeRepositoryInterface" table="oauth_scopes">
     <id name="id" type="integer">
       <generator strategy="AUTO"/>

diff --git a/etc/Model.png b/etc/Model.png