CS fixes

contributte · Jun 10, 2021 · f2bdf01 · f2bdf01
1 parent 96d05a2
commit f2bdf01
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 83 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,6 +11,6 @@ indent_style = tab
 indent_size = tab
 tab_width = 4
 
-[{*.json,*.yml,*.md}]
+[{*.json, *.yaml, *.yml, *.md}]
 indent_style = space
 indent_size = 2
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
-github: [f3l1x]
-custom: ["https://contributte.org/partners.html"]
+github: [ f3l1x ]
+custom: [ "https://contributte.org/partners.html" ]
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -23,8 +23,8 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["7.4"]
-        operating-system: ["ubuntu-latest"]
+        php-version: [ "7.4" ]
+        operating-system: [ "ubuntu-latest" ]
       fail-fast: false
 
     steps:
@@ -82,8 +82,8 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["7.4"]
-        operating-system: ["ubuntu-latest"]
+        php-version: [ "7.4" ]
+        operating-system: [ "ubuntu-latest" ]
       fail-fast: false
 
     steps:
@@ -137,18 +137,18 @@ jobs:
     runs-on: "${{ matrix.operating-system }}"
 
     services:
-        mysql:
-            image: mysql:5.7
-            env:
-                MYSQL_ALLOW_EMPTY_PASSWORD: yes
-                MYSQL_DATABASE: tests
-            ports:
-                - 3306:3306
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: tests
+        ports:
+          - 3306:3306
 
     strategy:
       matrix:
-        php-version: ["7.4"]
-        operating-system: ["ubuntu-latest"]
+        php-version: [ "7.4" ]
+        operating-system: [ "ubuntu-latest" ]
         composer-args: [ "" ]
         include:
           - php-version: "7.4"
@@ -215,18 +215,18 @@ jobs:
     runs-on: "${{ matrix.operating-system }}"
 
     services:
-        mysql:
-            image: mysql:5.7
-            env:
-                MYSQL_ALLOW_EMPTY_PASSWORD: yes
-                MYSQL_DATABASE: tests
-            ports:
-                - 3306:3306
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: tests
+        ports:
+          - 3306:3306
 
     strategy:
       matrix:
-        php-version: ["7.4"]
-        operating-system: ["ubuntu-latest"]
+        php-version: [ "7.4" ]
+        operating-system: [ "ubuntu-latest" ]
       fail-fast: false
 
     if: "github.event_name == 'push'"

diff --git a/composer.json b/composer.json
@@ -1,60 +1,69 @@
 {
-	"name": "ublaboo/datagrid",
-	"type": "library",
-	"description": "DataGrid for Nette Framework: filtering, sorting, pagination, tree view, table view, translator, etc",
-	"keywords": ["datagrid", "grid", "nette", "contributte", "table", "data"],
-	"license": ["MIT"],
-	"authors": [
-		{
-			"name": "Pavel Janda",
-			"homepage": "https://paveljanda.com"
-		},
-		{
-			"name": "Milan Felix Šulc",
-			"homepage": "https://f3l1x.io"
-		}
-	],
-	"autoload": {
-		"psr-4": {
-			"Ublaboo\\DataGrid\\": "src/"
-		}
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Ublaboo\\DataGrid\\Tests\\": "tests"
-		}
-	},
-	"require": {
-		"php": ">=7.2",
-		"contributte/application": "^0.5.0",
-		"nette/di": "^3.0.0",
-		"nette/forms": "^3.1.3",
-		"nette/utils": "^3.0.1",
-		"symfony/property-access": "^3.0.0 || ^4.0.0 || ^5.0.0"
-	},
-	"require-dev": {
-		"dibi/dibi": "^3.0.0 || ^4.0.0",
-		"doctrine/orm": "^2.6.12",
-		"elasticsearch/elasticsearch": "^7.1",
-		"gamee/php-code-checker-rules": "^2.0.21",
-		"mockery/mockery": "^1.3.3",
-		"nette/database": "^3.0.2",
-		"nette/tester": "^2.3.4",
-		"nextras/dbal": "^3.0.1 || ^4.0",
-		"nextras/orm": "^3.1.0 || ^4.0",
-		"ninjify/coding-standard": "^0.12.0",
-		"phpstan/phpstan-nette": "^0.12.14",
-		"tharos/leanmapper": "^3.4.2 || ^4.0.0",
-		"tracy/tracy": "^2.6.3"
-	},
-	"prefer-stable": true,
-	"minimum-stability": "dev",
-	"config": {
-		"sort-packages": true
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "6.7.x-dev"
-		}
-	}
+  "name": "ublaboo/datagrid",
+  "type": "library",
+  "description": "DataGrid for Nette Framework: filtering, sorting, pagination, tree view, table view, translator, etc",
+  "keywords": [
+    "datagrid",
+    "grid",
+    "nette",
+    "contributte",
+    "table",
+    "data"
+  ],
+  "license": [
+    "MIT"
+  ],
+  "authors": [
+    {
+      "name": "Pavel Janda",
+      "homepage": "https://paveljanda.com"
+    },
+    {
+      "name": "Milan Felix Šulc",
+      "homepage": "https://f3l1x.io"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Ublaboo\\DataGrid\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Ublaboo\\DataGrid\\Tests\\": "tests"
+    }
+  },
+  "require": {
+    "php": ">=7.2",
+    "contributte/application": "^0.5.0",
+    "nette/di": "^3.0.0",
+    "nette/forms": "^3.1.3",
+    "nette/utils": "^3.0.1",
+    "symfony/property-access": "^3.0.0 || ^4.0.0 || ^5.0.0"
+  },
+  "require-dev": {
+    "dibi/dibi": "^3.0.0 || ^4.0.0",
+    "doctrine/orm": "^2.6.12",
+    "elasticsearch/elasticsearch": "^7.1",
+    "gamee/php-code-checker-rules": "^2.0.21",
+    "mockery/mockery": "^1.3.3",
+    "nette/database": "^3.0.2",
+    "nette/tester": "^2.3.4",
+    "nextras/dbal": "^3.0.1 || ^4.0",
+    "nextras/orm": "^3.1.0 || ^4.0",
+    "ninjify/coding-standard": "^0.12.0",
+    "phpstan/phpstan-nette": "^0.12.14",
+    "tharos/leanmapper": "^3.4.2 || ^4.0.0",
+    "tracy/tracy": "^2.6.3"
+  },
+  "prefer-stable": true,
+  "minimum-stability": "dev",
+  "config": {
+    "sort-packages": true
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "6.7.x-dev"
+    }
+  }
 }