Merge pull request #30 from tattersoftware/settings

Settings

Author: MGatner

.github/workflows/compare.yml

@@ -8,11 +8,6 @@ on:
       - develop
     paths:
       - 'src/**'
-  push:
-    branches:
-      - develop
-    paths:
-      - 'src/**'
 
 jobs:
   compare:

README.md

@@ -3,6 +3,7 @@ File uploads and management, for CodeIgniter 4
 
 [![](https://github.com/tattersoftware/codeigniter4-files/workflows/PHPUnit/badge.svg)](https://github.com/tattersoftware/codeigniter4-files/actions?query=workflow%3A%22PHPUnit%22)
 [![](https://github.com/tattersoftware/codeigniter4-files/workflows/PHPStan/badge.svg)](https://github.com/tattersoftware/codeigniter4-files/actions?query=workflow%3A%PHPStan%22)
+[![Coverage Status](https://coveralls.io/repos/github/tattersoftware/codeigniter4-files/badge.svg?branch=develop)](https://coveralls.io/github/tattersoftware/codeigniter4-files?branch=develop)
 
 ## Quick Start
 

composer.json

@@ -29,7 +29,7 @@
 		"tatter/audits": "^1.0",
 		"tatter/exports": "^2.0",
 		"tatter/permits": "^2.0",
-		"tatter/settings": "^1.0",
+		"tatter/settings": "^1.0 || ^2.0",
 		"tatter/thumbnails": "^1.2",
 		"twbs/bootstrap": "^4.5"
 	},

src/Database/Seeds/FileSeeder.php

@@ -6,34 +6,39 @@ class FileSeeder extends \CodeIgniter\Database\Seeder
 {
 	public function run()
 	{
+		// Compatible with Settings v1 and v2
 		$templates = [
 			[
 				'name'      => 'perPage',
-				'scope'     => 'user',
-				'content'   => '10',
+				'datatype'  => 'int',
 				'summary'   => 'Number of items to show per page',
+				'content'   => '10',
+				'scope'     => 'user',
 				'protected' => 1,
 			],
 			[
 				'name'      => 'filesFormat',
-				'scope'     => 'user',
+				'datatype'  => 'string',
+				'summary'   => 'Display format for listing files',
 				'content'   => 'cards',
+				'scope'     => 'user',
 				'protected' => 0,
-				'summary'   => 'Display format for listing files',
 			],
 			[
 				'name'      => 'filesSort',
-				'scope'     => 'user',
+				'datatype'  => 'string',
+				'summary'   => 'Sort field for listing files',
 				'content'   => 'filename',
+				'scope'     => 'user',
 				'protected' => 0,
-				'summary'   => 'Sort field for listing files',
 			],
 			[
 				'name'      => 'filesOrder',
-				'scope'     => 'user',
+				'datatype'  => 'string',
+				'summary'   => 'Sort order for listing files',
 				'content'   => 'asc',
+				'scope'     => 'user',
 				'protected' => 0,
-				'summary'   => 'Sort order for listing files',
 			],
 		];
 

src/Models/FileModel.php

@@ -68,7 +68,7 @@ public static function storage(): string
 		$thumbnails = $storage . 'thumbnails';
 		if (! is_dir($thumbnails) && ! @mkdir($thumbnails, 0775, true))
 		{
-			throw FilesException::forDirFail($thumbnails);
+			throw FilesException::forDirFail($thumbnails); // @codeCoverageIgnore
 		}
 
 		return $storage;

tests/unit/ControllerTest.php

@@ -80,7 +80,8 @@ public function testGetSortUsesSettings()
 
 	public function testGetSortIgnoresInvalid()
 	{
-		$_REQUEST['sort'] = 'foobar';
+		$_REQUEST['sort']              = 'foobar';
+		service('settings')->filesSort = 'bambaz';
 
 		$this->controller(Files::class);