Cleanup

Model/MyModel.php

@@ -1026,7 +1026,10 @@ class MyModel extends ShimModel {
 	 */
 	public function isUndisposableEmail($email, $onlineMode = false, $proceed = false) {
 		if (!isset($this->UndisposableEmail)) {
-			App::import('Vendor', 'undisposable/undisposable');
+			App::import('Vendor', 'ToolsExtra.undisposable/undisposable');
+			if (!class_exists('UndisposableEmail')) {
+				return true;
+			}
 			$this->UndisposableEmail = new UndisposableEmail();
 		}
 		if (!$onlineMode) {

Test/Case/Model/Behavior/TypographicBehaviorTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Behavior', 'Tools.Typographic');
+App::uses('TypographicBehavior', 'Tools.Model/Behavior');
 App::uses('AppModel', 'Model');
 App::uses('MyCakeTestCase', 'Tools.TestSuite');
 

Test/Case/Model/CodeKeyTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('CodeKey', 'Tools.Model');
+App::uses('CodeKey', 'Tools.Model');
 App::uses('MyCakeTestCase', 'Tools.TestSuite');
 
 class CodeKeyTest extends MyCakeTestCase {

Test/Case/Model/TokenTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Token', 'Tools.Model');
+App::uses('Token', 'Tools.Model');
 App::uses('MyCakeTestCase', 'Tools.TestSuite');
 
 class TokenTest extends MyCakeTestCase {

docs/TinyAuth/TinyAuth.md

@@ -97,9 +97,6 @@ public $components = [
 
 Now create a file in /Config/ called acl.ini like so:
 ```ini
-[Tools.Countries]
-* = superadmin ; this is a comment
-
 [Account]
 edit,change_pw = *
 
@@ -110,6 +107,9 @@ index = *
 [Users]
 index,search = user
 * = moderator,admin
+
+[Data.Countries]
+* = superadmin ; this is a comment
 ```
 
 The format is normal PHP INI style. I already included all kind of examples. * is a placeholder for "any".
@@ -231,4 +231,4 @@ See the inline class documentation or the test cases for details.
 A shell to quickly modify the INI file (and batch-update for new controllers etc) should be ready some time soon.
 
 There might some day also the possibility to use some CRUD backend to manage the ACL (either via database or modifying the INI file).
-If someone wants to help, go for it.
+If someone wants to help, go for it.