move Bridge

nojimage · nojimage · commit 143aa9bc233f · 2020-01-15T13:30:34.000+09:00
diff --git a/src/Bridge/Entity/ExpiryDateTimeTrait.php b/src/Bridge/Entity/ExpiryDateTimeTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Entity;
+namespace OAuthServer\Bridge\Entity;
 
 use Cake\I18n\FrozenTime;
 use DateTimeImmutable;
diff --git a/src/Bridge/Entity/TokenEntityTrait.php b/src/Bridge/Entity/TokenEntityTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Entity;
+namespace OAuthServer\Bridge\Entity;
 
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
diff --git a/src/Bridge/Entity/User.php b/src/Bridge/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Entity;
+namespace OAuthServer\Bridge\Entity;
 
 use League\OAuth2\Server\Entities\UserEntityInterface;
 
diff --git a/src/Bridge/Repository/AccessTokenRepository.php b/src/Bridge/Repository/AccessTokenRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Repository;
+namespace OAuthServer\Bridge\Repository;
 
 use Cake\Datasource\ModelAwareTrait;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
diff --git a/src/Bridge/Repository/AuthCodeRepository.php b/src/Bridge/Repository/AuthCodeRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Repository;
+namespace OAuthServer\Bridge\Repository;
 
 use Cake\Datasource\ModelAwareTrait;
 use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
diff --git a/src/Bridge/Repository/ClientRepository.php b/src/Bridge/Repository/ClientRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Repository;
+namespace OAuthServer\Bridge\Repository;
 
 use Cake\Datasource\ModelAwareTrait;
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
diff --git a/src/Bridge/Repository/RefreshTokenRepository.php b/src/Bridge/Repository/RefreshTokenRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Repository;
+namespace OAuthServer\Bridge\Repository;
 
 use Cake\Datasource\ModelAwareTrait;
 use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
diff --git a/src/Bridge/Repository/ScopeRepository.php b/src/Bridge/Repository/ScopeRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Repository;
+namespace OAuthServer\Bridge\Repository;
 
 use Cake\Datasource\ModelAwareTrait;
 use Cake\Event\EventDispatcherInterface;
diff --git a/src/Bridge/Repository/UserRepository.php b/src/Bridge/Repository/UserRepository.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace OAuthServer\Model\Bridge\Repository;
+namespace OAuthServer\Bridge\Repository;
 
 use Cake\Datasource\RepositoryInterface;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
-use OAuthServer\Model\Bridge\Entity\User;
-use OAuthServer\Model\Bridge\UserFinderByUserCredentialsInterface;
+use OAuthServer\Bridge\Entity\User;
+use OAuthServer\Bridge\UserFinderByUserCredentialsInterface;
 
 /**
  * implemented UserRepositoryInterface
diff --git a/src/Bridge/UserFinderByUserCredentialsInterface.php b/src/Bridge/UserFinderByUserCredentialsInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuthServer\Model\Bridge;
+namespace OAuthServer\Bridge;
 
 use Cake\Datasource\EntityInterface;
 
diff --git a/src/Model/Entity/AccessToken.php b/src/Model/Entity/AccessToken.php
@@ -5,9 +5,9 @@
 use Cake\ORM\Entity;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\Traits\AccessTokenTrait;
-use OAuthServer\Model\Bridge\Entity\ExpiryDateTimeTrait;
-use OAuthServer\Model\Bridge\Entity\TokenEntityTrait;
-use OAuthServer\Model\Bridge\Entity\User;
+use OAuthServer\Bridge\Entity\ExpiryDateTimeTrait;
+use OAuthServer\Bridge\Entity\TokenEntityTrait;
+use OAuthServer\Bridge\Entity\User;
 
 /**
  * implemented AccessTokenEntityInterface
diff --git a/src/Model/Entity/AuthCode.php b/src/Model/Entity/AuthCode.php
@@ -4,9 +4,9 @@
 
 use Cake\ORM\Entity;
 use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
-use OAuthServer\Model\Bridge\Entity\ExpiryDateTimeTrait;
-use OAuthServer\Model\Bridge\Entity\TokenEntityTrait;
-use OAuthServer\Model\Bridge\Entity\User;
+use OAuthServer\Bridge\Entity\ExpiryDateTimeTrait;
+use OAuthServer\Bridge\Entity\TokenEntityTrait;
+use OAuthServer\Bridge\Entity\User;
 
 /**
  * Class AuthCode
diff --git a/src/Model/Entity/RefreshToken.php b/src/Model/Entity/RefreshToken.php
@@ -5,7 +5,7 @@
 use Cake\ORM\Entity;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
-use OAuthServer\Model\Bridge\Entity\ExpiryDateTimeTrait;
+use OAuthServer\Bridge\Entity\ExpiryDateTimeTrait;
 
 /**
  * implemented RefreshTokenEntityInterface
diff --git a/tests/TestCase/Bridge/Repository/AccessTokenRepositoryTest.php b/tests/TestCase/Bridge/Repository/AccessTokenRepositoryTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace OAuthServer\Test\TestCase\Model\Bridge\Repository;
+namespace OAuthServer\Test\TestCase\Bridge\Repository;
 
 use Cake\I18n\FrozenTime;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use League\OAuth2\Server\Exception\UniqueTokenIdentifierConstraintViolationException;
-use OAuthServer\Model\Bridge\Repository\AccessTokenRepository;
-use OAuthServer\Model\Bridge\Repository\ClientRepository;
-use OAuthServer\Model\Bridge\Repository\ScopeRepository;
+use OAuthServer\Bridge\Repository\AccessTokenRepository;
+use OAuthServer\Bridge\Repository\ClientRepository;
+use OAuthServer\Bridge\Repository\ScopeRepository;
 use OAuthServer\Model\Entity\AccessToken;
 use OAuthServer\Model\Entity\Scope;
 use OAuthServer\Model\Table\AccessTokensTable;
diff --git a/tests/TestCase/Bridge/Repository/AuthCodeRepositoryTest.php b/tests/TestCase/Bridge/Repository/AuthCodeRepositoryTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace OAuthServer\Test\TestCase\Model\Bridge\Repository;
+namespace OAuthServer\Test\TestCase\Bridge\Repository;
 
 use Cake\I18n\FrozenTime;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use League\OAuth2\Server\Exception\UniqueTokenIdentifierConstraintViolationException;
-use OAuthServer\Model\Bridge\Repository\AuthCodeRepository;
-use OAuthServer\Model\Bridge\Repository\ClientRepository;
-use OAuthServer\Model\Bridge\Repository\ScopeRepository;
+use OAuthServer\Bridge\Repository\AuthCodeRepository;
+use OAuthServer\Bridge\Repository\ClientRepository;
+use OAuthServer\Bridge\Repository\ScopeRepository;
 use OAuthServer\Model\Entity\AuthCode;
 use OAuthServer\Model\Entity\Scope;
 use OAuthServer\Model\Table\AuthCodesTable;
diff --git a/tests/TestCase/Bridge/Repository/ClientRepositoryTest.php b/tests/TestCase/Bridge/Repository/ClientRepositoryTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace OAuthServer\Test\TestCase\Model\Bridge\Repository;
+namespace OAuthServer\Test\TestCase\Bridge\Repository;
 
 use Cake\TestSuite\TestCase;
-use OAuthServer\Model\Bridge\Repository\ClientRepository;
+use OAuthServer\Bridge\Repository\ClientRepository;
 
 class ClientRepositoryTest extends TestCase
 {
diff --git a/tests/TestCase/Bridge/Repository/RefreshTokenRepositoryTest.php b/tests/TestCase/Bridge/Repository/RefreshTokenRepositoryTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace OAuthServer\Test\TestCase\Model\Bridge\Repository;
+namespace OAuthServer\Test\TestCase\Bridge\Repository;
 
 use Cake\I18n\FrozenTime;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use League\OAuth2\Server\Exception\UniqueTokenIdentifierConstraintViolationException;
-use OAuthServer\Model\Bridge\Repository\AccessTokenRepository;
-use OAuthServer\Model\Bridge\Repository\RefreshTokenRepository;
+use OAuthServer\Bridge\Repository\AccessTokenRepository;
+use OAuthServer\Bridge\Repository\RefreshTokenRepository;
 use OAuthServer\Model\Entity\AccessToken;
 use OAuthServer\Model\Entity\RefreshToken;
 use OAuthServer\Model\Table\RefreshTokensTable;
diff --git a/tests/TestCase/Bridge/Repository/ScopeRepositoryTest.php b/tests/TestCase/Bridge/Repository/ScopeRepositoryTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace OAuthServer\Test\TestCase\Model\Bridge\Repository;
+namespace OAuthServer\Test\TestCase\Bridge\Repository;
 
 use Cake\TestSuite\TestCase;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
-use OAuthServer\Model\Bridge\Repository\ScopeRepository;
+use OAuthServer\Bridge\Repository\ScopeRepository;
 use OAuthServer\Model\Entity\Client;
 use OAuthServer\Model\Entity\Scope;
 
diff --git a/tests/TestCase/Bridge/Repository/UserRepositoryTest.php b/tests/TestCase/Bridge/Repository/UserRepositoryTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace OAuthServer\Test\TestCase\Model\Bridge\Repository;
+namespace OAuthServer\Test\TestCase\Bridge\Repository;
 
 use Cake\ORM\Entity;
-use OAuthServer\Model\Bridge\Entity\User;
-use OAuthServer\Model\Bridge\Repository\UserRepository;
-use OAuthServer\Model\Bridge\UserFinderByUserCredentialsInterface;
+use OAuthServer\Bridge\Entity\User;
+use OAuthServer\Bridge\Repository\UserRepository;
+use OAuthServer\Bridge\UserFinderByUserCredentialsInterface;
 use OAuthServer\Model\Entity\Client;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/TestCase/Model/Entity/ClientTest.php b/tests/TestCase/Model/Entity/ClientTest.php
diff --git a/tests/TestCase/Model/Entity/ScopeTest.php b/tests/TestCase/Model/Entity/ScopeTest.php
diff --git a/tests/TestCase/Model/Table/OauthClientsTableTest.php b/tests/TestCase/Model/Table/OauthClientsTableTest.php
diff --git a/tests/TestCase/Model/Table/OauthScopesTableTest.php b/tests/TestCase/Model/Table/OauthScopesTableTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace OAuthServer\Test\TestCase\Model\Bridge\Repository;`
	`3`	`+namespace OAuthServer\Test\TestCase\Bridge\Repository;`
`4`	`4`
`5`	`5`	`use Cake\TestSuite\TestCase;`
`6`		`-use OAuthServer\Model\Bridge\Repository\ClientRepository;`
	`6`	`+use OAuthServer\Bridge\Repository\ClientRepository;`
`7`	`7`
`8`	`8`	`class ClientRepositoryTest extends TestCase`
`9`	`9`	`{`