Merge remote-tracking branch 'origin/master' into cake5

dereuromark · dereuromark · commit 990024bf2602 · 2023-08-07T02:08:15.000+02:00
# Conflicts:
#	.github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,10 +52,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
+          key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
 
-      - name: Composer install --no-progress --prefer-dist --optimize-autoloader
+      - name: Composer install
         run: |
           composer --version
           if ${{ matrix.prefer-lowest == 'prefer-lowest' }}
@@ -104,8 +103,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
+          key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
 
       - name: Composer Install
         run: composer stan-setup
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
 		"cakephp/authorization": "3.x-dev",
 		"fig-r/psr2r-sniffer": "dev-next",
 		"composer/semver": "^3.0",
-		"phpunit/phpunit": "^9.5"
+		"phpunit/phpunit": "^10.2"
 	},
 	"support": {
 		"source": "https://github.com/dereuromark/cakephp-tinyauth"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,18 +12,14 @@
 		</testsuite>
 	</testsuites>
 
-	<listeners>
-		<listener class="Cake\TestSuite\Fixture\FixtureInjector">
-			<arguments>
-				<object class="Cake\TestSuite\Fixture\FixtureManager"/>
-			</arguments>
-		</listener>
-	</listeners>
+	<extensions>
+		<bootstrap class="\Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
+	</extensions>
 
-	<filter>
-		<whitelist>
+	<source>
+		<include>
 			<directory suffix=".php">src/</directory>
-		</whitelist>
-	</filter>
+		</include>
+	</source>
 
 </phpunit>
diff --git a/src/Controller/Component/AuthUserComponent.php b/src/Controller/Component/AuthUserComponent.php
@@ -24,7 +24,7 @@ class AuthUserComponent extends Component {
 	/**
 	 * @var array
 	 */
-	protected array $components = ['Auth'];
+	protected array $components = ['TinyAuth.Auth'];
 
 	/**
 	 * @param \Cake\Controller\ComponentRegistry $registry
diff --git a/src/TinyAuthPlugin.php b/src/TinyAuthPlugin.php
@@ -7,7 +7,7 @@
 /**
  * Plugin for TinyAuth
  */
-class Plugin extends BasePlugin {
+class TinyAuthPlugin extends BasePlugin {
 
 	/**
 	 * @var bool
diff --git a/tests/TestCase/Command/TinyAuthSyncCommandTest.php b/tests/TestCase/Command/TinyAuthSyncCommandTest.php
@@ -2,12 +2,14 @@
 
 namespace TinyAuth\Test\TestCase\Command;
 
-use Cake\Console\Command;
+use Cake\Command\Command;
+use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\Core\Configure;
-use Cake\Filesystem\Folder;
-use Cake\TestSuite\ConsoleIntegrationTestCase;
+use Cake\TestSuite\TestCase;
 
-class TinyAuthSyncCommandTest extends ConsoleIntegrationTestCase {
+class TinyAuthSyncCommandTest extends TestCase {
+
+	use ConsoleIntegrationTestTrait;
 
 	/**
 	 * setup method
@@ -34,8 +36,8 @@ public function testSync() {
 		Configure::write('TinyAuth.aclFilePath', TESTS . 'test_files/subfolder/');
 		Configure::write('TinyAuth.allowFilePath', TESTS . 'test_files/');
 
-		$folder = new Folder();
-		$folder->copy('/tmp' . DS . 'src' . DS . 'Controller' . DS, ['from' => TESTS . 'test_app' . DS . 'Controller' . DS]);
+		//$folder = new Folder();
+		//$folder->copy('/tmp' . DS . 'src' . DS . 'Controller' . DS, ['from' => TESTS . 'test_app' . DS . 'Controller' . DS]);
 
 		$this->exec('tiny_auth_sync foo,bar -d -v');
 
diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php
@@ -8,6 +8,9 @@
 use Cake\Event\Event;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
+use Cake\Routing\Route\DashedRoute;
+use Cake\Routing\RouteBuilder;
+use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 use TestApp\Controller\Admin\MyPrefix\MyTestController;
 use TestApp\Controller\OffersController;
@@ -33,6 +36,12 @@ public function setUp(): void {
 			'allowFilePath' => Plugin::path('TinyAuth') . 'tests' . DS . 'test_files' . DS,
 			'autoClearCache' => true,
 		];
+
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->scope('/', function (RouteBuilder $routes): void {
+			$routes->fallbacks();
+		});
 	}
 
 	/**
@@ -117,13 +126,14 @@ public function testDeniedActionInController() {
 	 */
 	public function testDeniedAction() {
 		$request = new ServerRequest([
-		'params' => [
-			'plugin' => 'Extras',
-			'controller' => 'Offers',
-			'action' => 'superPrivate',
-			'_ext' => null,
-			'pass' => [1],
-		]]);
+			'params' => [
+				'plugin' => 'Extras',
+				'controller' => 'Offers',
+				'action' => 'superPrivate',
+				'_ext' => null,
+				'pass' => [1],
+			],
+		]);
 		$controller = new OffersController($request);
 		$controller->loadComponent('TinyAuth.Auth', $this->componentConfig);
 
@@ -223,7 +233,7 @@ public function testInvalid() {
 	protected function getControllerMock(ServerRequest $request) {
 		$controller = $this->getMockBuilder(Controller::class)
 			->setConstructorArgs([$request])
-			->setMethods(['isAction'])
+			->onlyMethods(['isAction'])
 			->getMock();
 
 		$controller->expects($this->once())->method('isAction')->willReturn(true);
diff --git a/tests/TestCase/Controller/Component/AuthUserComponentTest.php b/tests/TestCase/Controller/Component/AuthUserComponentTest.php
@@ -2,7 +2,6 @@
 
 namespace TinyAuth\Test\TestCase\Controller\Component;
 
-use Cake\Controller\Component\AuthComponent;
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
@@ -33,7 +32,7 @@ public function setUp(): void {
 		$controller = new Controller(new ServerRequest());
 		$componentRegistry = new ComponentRegistry($controller);
 		$this->AuthUser = new TestAuthUserComponent($componentRegistry);
-		$this->AuthUser->Auth = $this->getMockBuilder(AuthComponent::class)->setMethods(['user'])->setConstructorArgs([$componentRegistry])->getMock();
+		//$this->AuthUser->Auth = $this->getMockBuilder(AuthComponent::class)->onlyMethods(['user'])->setConstructorArgs([$componentRegistry])->getMock();
 
 		Configure::write('Roles', [
 			'user' => 1,
diff --git a/tests/TestCase/Controller/Component/AuthenticationComponentTest.php b/tests/TestCase/Controller/Component/AuthenticationComponentTest.php
@@ -175,7 +175,7 @@ public function testIsPublicAllowPrefixedFail() {
 	protected function getControllerMock(ServerRequest $request) {
 		$controller = $this->getMockBuilder(Controller::class)
 			->setConstructorArgs([$request])
-			->setMethods(['isAction'])
+			->onlyMethods(['isAction'])
 			->getMock();
 
 		$controller->expects($this->any())->method('isAction')->willReturn(true);
diff --git a/tests/TestCase/Panel/AuthPanelTest.php b/tests/TestCase/Panel/AuthPanelTest.php
@@ -60,7 +60,7 @@ public function tearDown(): void {
 	 * @return void
 	 */
 	public function testPanelRestrictedAction() {
-		$controller = new Controller();
+		$controller = new Controller(new ServerRequest());
 		$event = new Event('event', $controller);
 
 		$this->panel->shutdown($event);
diff --git a/tests/TestCase/View/Helper/AuthUserHelperTest.php b/tests/TestCase/View/Helper/AuthUserHelperTest.php
@@ -37,8 +37,10 @@ class AuthUserHelperTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
-		Router::scope('/', function(RouteBuilder $routes) {
-			$routes->fallbacks(DashedRoute::class);
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->scope('/', function (RouteBuilder $routes): void {
+			$routes->fallbacks();
 		});
 
 		Configure::write('Roles', [
@@ -82,7 +84,9 @@ public function testIsAuthorizedValid() {
 		$result = $this->AuthUserHelper->hasAccess($request);
 		$this->assertTrue($result);
 
-		Router::connect(
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->connect(
 			'/edit/*',
 			['controller' => 'Tags', 'action' => 'edit'],
 			['_name' => 'Tags::edit'],
@@ -110,7 +114,9 @@ public function testIsAuthorizedInvalid() {
 		$result = $this->AuthUserHelper->hasAccess($request);
 		$this->assertFalse($result);
 
-		Router::connect(
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->connect(
 			'/delete/*',
 			['controller' => 'Tags', 'action' => 'delete'],
 			['_name' => 'Tags::delete'],
@@ -136,7 +142,9 @@ public function testIsAuthorizedNotLoggedIn() {
 		$result = $this->AuthUserHelper->hasAccess($request);
 		$this->assertFalse($result);
 
-		Router::connect(
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->connect(
 			'/edit/*',
 			['controller' => 'Tags', 'action' => 'edit'],
 			['_name' => 'Tags::edit'],
@@ -159,7 +167,9 @@ public function testNamedRouteMissingControllerActionException() {
 		];
 		$this->View->set('_authUser', $user);
 
-		Router::connect(
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->connect(
 			'/edit/*',
 			['action' => 'edit'],
 			['_name' => 'Tags::edit'],
@@ -183,7 +193,9 @@ public function testInvalidNamedRouteException() {
 		];
 		$this->View->set('_authUser', $user);
 
-		Router::connect(
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->connect(
 			'/edit/*',
 			['action' => 'edit'],
 			['_name' => 'Tags::edit'],
@@ -208,7 +220,9 @@ public function testIncompleteNamedRouteException() {
 		];
 		$this->View->set('_authUser', $user);
 
-		Router::connect(
+		$builder = Router::createRouteBuilder('/');
+		$builder->setRouteClass(DashedRoute::class);
+		$builder->connect(
 			'/view/{id}',
 			['controller' => 'Posts', 'action' => 'view'],
 			['_name' => 'Posts::view'],
diff --git a/tests/TestCase/View/Helper/AuthenticationHelperTest.php b/tests/TestCase/View/Helper/AuthenticationHelperTest.php
@@ -15,6 +15,11 @@ class AuthenticationHelperTest extends TestCase {
 	 */
 	protected $helper;
 
+	/**
+	 * @var array
+	 */
+	protected $config;
+
 	/**
 	 * setUp method
 	 *
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 
+use Cake\Cache\Cache;
+use Cake\Core\Configure;
+use Cake\Core\Plugin;
+use Cake\Datasource\ConnectionManager;
+use Cake\TestSuite\Fixture\SchemaLoader;
 use TestApp\View\AppView;
-
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
- */
-require dirname(__DIR__) . '/vendor/cakephp/cakephp/src/basics.php';
-require dirname(__DIR__) . '/vendor/autoload.php';
+use TinyAuth\TinyAuthPlugin;
 
 if (!defined('DS')) {
 	define('DS', DIRECTORY_SEPARATOR);
@@ -33,11 +33,16 @@
 define('CAKE_CORE_INCLUDE_PATH', ROOT . '/vendor/cakephp/cakephp');
 define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 
-Cake\Core\Configure::write('App', [
+require dirname(__DIR__) . '/vendor/autoload.php';
+require CORE_PATH . 'config/bootstrap.php';
+require CAKE_CORE_INCLUDE_PATH . '/src/functions.php';
+
+Configure::write('App', [
 	'namespace' => 'TestApp',
+	'encoding' => 'UTF-8',
 ]);
 
-Cake\Core\Configure::write('debug', true);
+Configure::write('debug', true);
 
 $cache = [
 	'default' => [
@@ -60,7 +65,7 @@
 	],
 ];
 
-Cake\Cache\Cache::setConfig($cache);
+Cache::setConfig($cache);
 
 // Why has this no effect?
 require TESTS . 'config' . DS . 'routes.php';
@@ -69,7 +74,7 @@
 define('ROLE_MODERATOR', 2);
 define('ROLE_ADMIN', 3);
 
-Cake\Core\Plugin::getCollection()->add(new TinyAuth\Plugin());
+Plugin::getCollection()->add(new TinyAuthPlugin());
 
 class_alias(AppView::class, 'App\View\AppView');
 
@@ -79,7 +84,7 @@ class_alias(AppView::class, 'App\View\AppView');
 	putenv('db_dsn=sqlite:///:memory:');
 }
 
-Cake\Datasource\ConnectionManager::setConfig('test', [
+ConnectionManager::setConfig('test', [
 	'className' => 'Cake\Database\Connection',
 	'driver' => getenv('db_class') ?: null,
 	'dsn' => getenv('db_dsn') ?: null,
@@ -89,6 +94,6 @@ class_alias(AppView::class, 'App\View\AppView');
 ]);
 
 if (env('FIXTURE_SCHEMA_METADATA')) {
-	$loader = new Cake\TestSuite\Fixture\SchemaLoader();
+	$loader = new SchemaLoader();
 	$loader->loadInternalFile(env('FIXTURE_SCHEMA_METADATA'));
 }
diff --git a/tests/schema.php b/tests/schema.php
@@ -0,0 +1,38 @@
+<?php
+
+use Cake\Utility\Inflector;
+
+$tables = [];
+
+/**
+ * @var \DirectoryIterator<\DirectoryIterator> $ierator
+ */
+$ierator = new DirectoryIterator(__DIR__ . DS . 'Fixture');
+foreach ($ierator as $file) {
+	if (!preg_match('/(\w+)Fixture.php$/', (string)$file, $matches)) {
+		continue;
+	}
+
+	$name = $matches[1];
+	$tableName = Inflector::underscore($name);
+	$class = 'Shim\\Test\\Fixture\\' . $name . 'Fixture';
+	try {
+		$object = (new ReflectionClass($class))->getProperty('fields');
+	} catch (ReflectionException $e) {
+		continue;
+	}
+
+	$array = $object->getDefaultValue();
+	$constraints = $array['_constraints'] ?? [];
+	$indexes = $array['_indexes'] ?? [];
+	unset($array['_constraints'], $array['_indexes'], $array['_options']);
+	$table = [
+		'table' => $tableName,
+		'columns' => $array,
+		'constraints' => $constraints,
+		'indexes' => $indexes,
+	];
+	$tables[$tableName] = $table;
+}
+
+return $tables;
