Skip to content
This repository has been archived by the owner on Mar 9, 2020. It is now read-only.

Commit

Permalink
Changed Scope from text to string; not null
Browse files Browse the repository at this point in the history
  • Loading branch information
TomHAnderson committed Apr 6, 2018
1 parent 7e787e4 commit 933ebef
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config/oauth2.doctrine-orm.global.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ return [
'scope' => [
'type' => 'field',
'name' => 'scope',
'datatype' => 'text',
'datatype' => 'string',
],
'is_default' => [
'type' => 'field',
Expand Down
2 changes: 1 addition & 1 deletion config/orm/ZF.OAuth2.Doctrine.Entity.Scope.dcm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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="ZF\OAuth2\Doctrine\Entity\Scope" table="Scope_OAuth2">
<id name="id" type="bigint"/>
<field name="scope" type="text" nullable="true"/>
<field name="scope" type="string" nullable="false"/>
<field name="isDefault" type="boolean" nullable="true"/>
<many-to-many field="client" target-entity="ZF\OAuth2\Doctrine\Entity\Client" inversed-by="scope">
<join-table name="ClientToScope_OAuth2">
Expand Down
4 changes: 2 additions & 2 deletions media/OAuth2-orm.module.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<skipper version="3.2.11.1392" mvc="Without MVC" orm="Doctrine2">
<skipper version="3.2.12.1400" mvc="Without MVC" orm="Doctrine2">
<module name="\api-skeletons/zf-oauth2-doctrine" local-name="api-skeletons/zf-oauth2-doctrine" namespace="\ZF\OAuth2\Doctrine\Entity" local-namespace="ZF\OAuth2\Doctrine\Entity" export-format="Doctrine2Xml" export-path="../config/orm" uuid="e33a902b-9096-46f4-81af-cb8fa813a736">
<entity name="\ZF\OAuth2\Doctrine\Entity\Client" local-name="Client" namespace="\ZF\OAuth2\Doctrine\Entity" uuid="0e40a98d-82ec-47f1-acc0-649982b1c48a">
<field name="id" type="bigint" required="true" unique="true" primary="true" auto-increment="true" uuid="f24288d3-c5ab-4e4f-a251-0bca949873d1"/>
Expand All @@ -18,7 +18,7 @@
<region namespace="\ZF\OAuth2\Doctrine\Entity" caption="Scope" uuid="98a49ed5-e644-4a4e-9b59-d5421643572a">
<entity name="\ZF\OAuth2\Doctrine\Entity\Scope" local-name="Scope" namespace="\ZF\OAuth2\Doctrine\Entity" uuid="8cc40580-9611-471f-a6c7-9a64ec3b2869">
<field name="id" type="bigint" required="true" unique="true" primary="true" uuid="c8033880-f92f-47e6-bbf8-e9f8a99299fb"/>
<field name="scope" type="text" uuid="54d7a7b3-1ffc-44f5-a198-fcd2d1f14dd5"/>
<field name="scope" type="string" required="true" uuid="54d7a7b3-1ffc-44f5-a198-fcd2d1f14dd5"/>
<field name="isDefault" type="boolean" uuid="944d76ea-159b-43fb-a182-5100908dfd7b"/>
<orm-attributes>
<attribute name="table">Scope_OAuth2</attribute>
Expand Down
2 changes: 1 addition & 1 deletion media/OAuth2-orm.skipper
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<skipper version="3.2.11.1392" mvc="Without MVC" orm="Doctrine2" name="zf-oauth2" uuid="b7638313-3ca8-4389-9163-d2bb1c15f725">
<skipper version="3.2.12.1400" mvc="Without MVC" orm="Doctrine2" name="zf-oauth2" uuid="b7638313-3ca8-4389-9163-d2bb1c15f725">
<external-module storage-path="OAuth2-orm.module.xml"/>
<visual-data>
<association uuid="1a897fc1-617e-4cc3-82b7-54f564d3335d" caption1-position-x="0" caption1-position-y="0" center-position-x="0" center-position-y="0" color="4288059030"/>
Expand Down

0 comments on commit 933ebef

Please sign in to comment.