gitattributes export fix

.gitattributes

@@ -12,3 +12,11 @@
 *.pdf binary
 *.dll binary
 *.exe binary
+
+# Remove files for archives generated using `git archive`
+phpunit.xml.dist export-ignore
+.travis.yml export-ignore
+.gitignore export-ignore
+.gitattributes export-ignore
+.editorconfig export-ignore
+tests/test_app export-ignore

composer.json

@@ -31,7 +31,7 @@
 		"psr-4": {
 			"Tools\\Test\\": "tests/",
 			"Cake\\Test\\": "vendor/cakephp/cakephp/tests/",
-			"App\\": "tests/TestApp/"
+			"App\\": "tests/test_app/"
 		}
 	},
 	"suggest": {

src/Model/Table/Table.php

@@ -380,7 +380,7 @@ class Table extends ShimTable {
 		}
 		$date = $value->format(FORMAT_DB_DATE);
 
-		if (!empty($options['allowEmpty']) && (empty($date) || $date == DEFAULT_DATE)) {
+		if (!empty($options['allowEmpty']) && empty($date)) {
 			return true;
 		}
 		if (Validation::date($date, $format)) {

src/Utility/Time.php

@@ -1128,7 +1128,7 @@ class Time extends CakeTime {
 	 *
 	 * @param string $searchString to parse
 	 * @param string $fieldName (Model.field)
-	 * @param array $options (see TimeLib::period)
+	 * @param array $options (see Time::period)
 	 * @return string query SQL Query
 	 */
 	public static function periodAsSql($searchString, $fieldName, array $options = []) {

tests/Fixture/TokensFixture.php

@@ -16,7 +16,7 @@ class TokensFixture extends TestFixture {
 	 */
 	public $fields = [
 		'id' => ['type' => 'integer', 'null' => false, 'default' => null, 'length' => 10],
-		'user_id' => ['type' => 'string', 'null' => true, 'length' => 36, 'comment' => ''],
+		'user_id' => ['type' => 'uuid', 'null' => true, 'length' => 36, 'comment' => ''],
 		'type' => ['type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'comment' => 'e.g.:activate,reactivate'],
 		'key' => ['type' => 'string', 'null' => true, 'default' => null, 'length' => 60, 'comment' => ''],
 		'content' => ['type' => 'string', 'null' => true, 'default' => null, 'comment' => 'can transport some information'],