Fix file indentation due to .editorconfig

This commit is contained in:
printempw 2018-02-16 15:44:36 +08:00
parent 42e06e8954
commit 0bc68090a8
5 changed files with 114 additions and 116 deletions

6
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "plugins"]
path = plugins
url = git@github.com:printempw/blessing-skin-plugins.git
ignore = dirty
path = plugins
url = git@github.com:printempw/blessing-skin-plugins.git
ignore = dirty

View File

@ -1,48 +1,48 @@
{
"name": "printempw/blessing-skin-server",
"description": "A web application brings your custom skins back in offline Minecraft servers.",
"license": "GPL-3.0",
"require": {
"php": ">=5.5.9",
"filp/whoops": "^2.1",
"predis/predis": "~1.0",
"gregwar/captcha": "^1.1",
"erusev/parsedown": "^1.6",
"swiggles/memcache": "^2.0",
"doctrine/inflector": "1.1.0",
"laravel/framework": "5.2.*",
"devitek/yaml-translation": "^2.0",
"printempw/laravel-datatables-lite": "^1.0"
"name": "printempw/blessing-skin-server",
"description": "A web application brings your custom skins back in offline Minecraft servers.",
"license": "GPL-3.0",
"require": {
"php": ">=5.5.9",
"filp/whoops": "^2.1",
"predis/predis": "~1.0",
"gregwar/captcha": "^1.1",
"erusev/parsedown": "^1.6",
"swiggles/memcache": "^2.0",
"doctrine/inflector": "1.1.0",
"laravel/framework": "5.2.*",
"devitek/yaml-translation": "^2.0",
"printempw/laravel-datatables-lite": "^1.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpdocumentor/reflection-docblock": "3.2.2",
"phpunit/phpunit": "~4.0",
"symfony/css-selector": "2.8.*|3.0.*",
"symfony/dom-crawler": "2.8.*|3.0.*",
"barryvdh/laravel-debugbar": "^2.3",
"league/flysystem-memory": "^1.0",
"mikey179/vfsStream": "1.6.4"
},
"autoload": {
"classmap": [
"app/Models",
"database"
],
"psr-4": {
"App\\": "app/"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpdocumentor/reflection-docblock": "3.2.2",
"phpunit/phpunit": "~4.0",
"symfony/css-selector": "2.8.*|3.0.*",
"symfony/dom-crawler": "2.8.*|3.0.*",
"barryvdh/laravel-debugbar": "^2.3",
"league/flysystem-memory": "^1.0",
"mikey179/vfsStream": "1.6.4"
},
"autoload": {
"classmap": [
"app/Models",
"database"
],
"psr-4": {
"App\\": "app/"
},
"files": [
"app/helpers.php"
]
},
"autoload-dev": {
"classmap": [
"tests"
]
},
"config": {
"preferred-install": "dist"
}
"files": [
"app/helpers.php"
]
},
"autoload-dev": {
"classmap": [
"tests"
]
},
"config": {
"preferred-install": "dist"
}
}

View File

@ -19,8 +19,19 @@
"codecov": "codecov -F js",
"dev": "gulp watch"
},
"jest": {
"timers": "fake"
"dependencies": {
"admin-lte": "^2.3.11",
"bootstrap": "^3.3.7",
"bootstrap-fileinput": "^4.4.2",
"es6-promise": "^4.1.1",
"font-awesome": "^4.7.0",
"highlight.js": "^9.12.0",
"icheck": "^1.0.2",
"jqPaginator": "^1.2.0",
"jquery": "^3.2.1",
"regenerator": "^0.12.2",
"sweetalert2": "^6.6.5",
"toastr": "^2.1.2"
},
"devDependencies": {
"babel-plugin-transform-inline-environment-variables": "^0.2.0",
@ -44,19 +55,8 @@
"node-sass": "^4.5.3",
"run-sequence": "^2.0.0"
},
"dependencies": {
"admin-lte": "^2.3.11",
"bootstrap": "^3.3.7",
"bootstrap-fileinput": "^4.4.2",
"es6-promise": "^4.1.1",
"font-awesome": "^4.7.0",
"highlight.js": "^9.12.0",
"icheck": "^1.0.2",
"jqPaginator": "^1.2.0",
"jquery": "^3.2.1",
"regenerator": "^0.12.2",
"sweetalert2": "^6.6.5",
"toastr": "^2.1.2"
"jest": {
"timers": "fake"
},
"optionalDependencies": {
"@types/jest": "^20.0.2"

View File

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
<phpunit colors="true"
backupGlobals="false"
stopOnFailure="false"
processIsolation="false"
backupStaticAttributes="false"
bootstrap="bootstrap/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Application Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./app</directory>
<exclude>
<file>./app/Http/routes.php</file>
</exclude>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing"/>
</php>
bootstrap="bootstrap/autoload.php">
<testsuites>
<testsuite name="Application Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./app</directory>
<exclude>
<file>./app/Http/routes.php</file>
</exclude>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing"/>
</php>
</phpunit>

View File

@ -1,36 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<staticContent>
<mimeMap fileExtension="." mimeType="image/png" />
<remove fileExtension=".woff"/>
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
<remove fileExtension=".woff2"/>
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
</staticContent>
<!--
For rewrite to work install URL Rewrite Module via Web Platform Installer
-->
<rewrite>
<rules>
<rule name="bss" patternSyntax="Wildcard">
<match url="*" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
</conditions>
<action type="Rewrite" url="index.php" />
</rule>
</rules>
</rewrite>
</system.webServer>
<system.webServer>
<staticContent>
<mimeMap fileExtension="." mimeType="image/png" />
<remove fileExtension=".woff"/>
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
<remove fileExtension=".woff2"/>
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
</staticContent>
<!-- For rewrite to work install URL Rewrite Module via Web Platform Installer -->
<rewrite>
<rules>
<rule name="bss" patternSyntax="Wildcard">
<match url="*" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
</conditions>
<action type="Rewrite" url="index.php" />
</rule>
</rules>
</rewrite>
</system.webServer>
<!-- Protect .env file -->
<location path="~/.env">
<system.web>
<authorization>
<deny users="*"/>
</authorization>
</system.web>
</location>
<!-- Protect .env file -->
<location path="~/.env">
<system.web>
<authorization>
<deny users="*"/>
</authorization>
</system.web>
</location>
</configuration>