Fix file indentation due to .editorconfig
This commit is contained in:
printempw
parent
42e06e8954
commit
0bc68090a8
6
.gitmodules
vendored
6
.gitmodules
vendored
|
|
@ -1,4 +1,4 @@
|
||||||
[submodule "plugins"]
|
[submodule "plugins"]
|
||||||
path = plugins
|
path = plugins
|
||||||
url = git@github.com:printempw/blessing-skin-plugins.git
|
url = git@github.com:printempw/blessing-skin-plugins.git
|
||||||
ignore = dirty
|
ignore = dirty
|
||||||
|
|
|
||||||
|
|
@ -1,48 +1,48 @@
|
||||||
{
|
{
|
||||||
"name": "printempw/blessing-skin-server",
|
"name": "printempw/blessing-skin-server",
|
||||||
"description": "A web application brings your custom skins back in offline Minecraft servers.",
|
"description": "A web application brings your custom skins back in offline Minecraft servers.",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.5.9",
|
"php": ">=5.5.9",
|
||||||
"filp/whoops": "^2.1",
|
"filp/whoops": "^2.1",
|
||||||
"predis/predis": "~1.0",
|
"predis/predis": "~1.0",
|
||||||
"gregwar/captcha": "^1.1",
|
"gregwar/captcha": "^1.1",
|
||||||
"erusev/parsedown": "^1.6",
|
"erusev/parsedown": "^1.6",
|
||||||
"swiggles/memcache": "^2.0",
|
"swiggles/memcache": "^2.0",
|
||||||
"doctrine/inflector": "1.1.0",
|
"doctrine/inflector": "1.1.0",
|
||||||
"laravel/framework": "5.2.*",
|
"laravel/framework": "5.2.*",
|
||||||
"devitek/yaml-translation": "^2.0",
|
"devitek/yaml-translation": "^2.0",
|
||||||
"printempw/laravel-datatables-lite": "^1.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": {
|
"files": [
|
||||||
"fzaninotto/faker": "~1.4",
|
"app/helpers.php"
|
||||||
"mockery/mockery": "0.9.*",
|
]
|
||||||
"phpdocumentor/reflection-docblock": "3.2.2",
|
},
|
||||||
"phpunit/phpunit": "~4.0",
|
"autoload-dev": {
|
||||||
"symfony/css-selector": "2.8.*|3.0.*",
|
"classmap": [
|
||||||
"symfony/dom-crawler": "2.8.*|3.0.*",
|
"tests"
|
||||||
"barryvdh/laravel-debugbar": "^2.3",
|
]
|
||||||
"league/flysystem-memory": "^1.0",
|
},
|
||||||
"mikey179/vfsStream": "1.6.4"
|
"config": {
|
||||||
},
|
"preferred-install": "dist"
|
||||||
"autoload": {
|
}
|
||||||
"classmap": [
|
|
||||||
"app/Models",
|
|
||||||
"database"
|
|
||||||
],
|
|
||||||
"psr-4": {
|
|
||||||
"App\\": "app/"
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"app/helpers.php"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"autoload-dev": {
|
|
||||||
"classmap": [
|
|
||||||
"tests"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"config": {
|
|
||||||
"preferred-install": "dist"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
30
package.json
30
package.json
|
|
@ -19,8 +19,19 @@
|
||||||
"codecov": "codecov -F js",
|
"codecov": "codecov -F js",
|
||||||
"dev": "gulp watch"
|
"dev": "gulp watch"
|
||||||
},
|
},
|
||||||
"jest": {
|
"dependencies": {
|
||||||
"timers": "fake"
|
"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": {
|
"devDependencies": {
|
||||||
"babel-plugin-transform-inline-environment-variables": "^0.2.0",
|
"babel-plugin-transform-inline-environment-variables": "^0.2.0",
|
||||||
|
|
@ -44,19 +55,8 @@
|
||||||
"node-sass": "^4.5.3",
|
"node-sass": "^4.5.3",
|
||||||
"run-sequence": "^2.0.0"
|
"run-sequence": "^2.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"jest": {
|
||||||
"admin-lte": "^2.3.11",
|
"timers": "fake"
|
||||||
"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"
|
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@types/jest": "^20.0.2"
|
"@types/jest": "^20.0.2"
|
||||||
|
|
|
||||||
42
phpunit.xml
42
phpunit.xml
|
|
@ -1,27 +1,27 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<phpunit backupGlobals="false"
|
<phpunit colors="true"
|
||||||
|
backupGlobals="false"
|
||||||
|
stopOnFailure="false"
|
||||||
|
processIsolation="false"
|
||||||
backupStaticAttributes="false"
|
backupStaticAttributes="false"
|
||||||
bootstrap="bootstrap/autoload.php"
|
|
||||||
colors="true"
|
|
||||||
convertErrorsToExceptions="true"
|
convertErrorsToExceptions="true"
|
||||||
convertNoticesToExceptions="true"
|
convertNoticesToExceptions="true"
|
||||||
convertWarningsToExceptions="true"
|
convertWarningsToExceptions="true"
|
||||||
processIsolation="false"
|
bootstrap="bootstrap/autoload.php">
|
||||||
stopOnFailure="false">
|
<testsuites>
|
||||||
<testsuites>
|
<testsuite name="Application Test Suite">
|
||||||
<testsuite name="Application Test Suite">
|
<directory suffix="Test.php">./tests</directory>
|
||||||
<directory suffix="Test.php">./tests</directory>
|
</testsuite>
|
||||||
</testsuite>
|
</testsuites>
|
||||||
</testsuites>
|
<filter>
|
||||||
<filter>
|
<whitelist processUncoveredFilesFromWhitelist="true">
|
||||||
<whitelist processUncoveredFilesFromWhitelist="true">
|
<directory suffix=".php">./app</directory>
|
||||||
<directory suffix=".php">./app</directory>
|
<exclude>
|
||||||
<exclude>
|
<file>./app/Http/routes.php</file>
|
||||||
<file>./app/Http/routes.php</file>
|
</exclude>
|
||||||
</exclude>
|
</whitelist>
|
||||||
</whitelist>
|
</filter>
|
||||||
</filter>
|
<php>
|
||||||
<php>
|
<env name="APP_ENV" value="testing"/>
|
||||||
<env name="APP_ENV" value="testing"/>
|
</php>
|
||||||
</php>
|
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
|
|
||||||
62
web.config
62
web.config
|
|
@ -1,36 +1,34 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<system.webServer>
|
<system.webServer>
|
||||||
<staticContent>
|
<staticContent>
|
||||||
<mimeMap fileExtension="." mimeType="image/png" />
|
<mimeMap fileExtension="." mimeType="image/png" />
|
||||||
<remove fileExtension=".woff"/>
|
<remove fileExtension=".woff"/>
|
||||||
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
|
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
|
||||||
<remove fileExtension=".woff2"/>
|
<remove fileExtension=".woff2"/>
|
||||||
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
|
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
|
||||||
</staticContent>
|
</staticContent>
|
||||||
<!--
|
<!-- For rewrite to work install URL Rewrite Module via Web Platform Installer -->
|
||||||
For rewrite to work install URL Rewrite Module via Web Platform Installer
|
<rewrite>
|
||||||
-->
|
<rules>
|
||||||
<rewrite>
|
<rule name="bss" patternSyntax="Wildcard">
|
||||||
<rules>
|
<match url="*" />
|
||||||
<rule name="bss" patternSyntax="Wildcard">
|
<conditions>
|
||||||
<match url="*" />
|
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
|
||||||
<conditions>
|
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
|
||||||
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
|
</conditions>
|
||||||
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
|
<action type="Rewrite" url="index.php" />
|
||||||
</conditions>
|
</rule>
|
||||||
<action type="Rewrite" url="index.php" />
|
</rules>
|
||||||
</rule>
|
</rewrite>
|
||||||
</rules>
|
</system.webServer>
|
||||||
</rewrite>
|
|
||||||
</system.webServer>
|
|
||||||
|
|
||||||
<!-- Protect .env file -->
|
<!-- Protect .env file -->
|
||||||
<location path="~/.env">
|
<location path="~/.env">
|
||||||
<system.web>
|
<system.web>
|
||||||
<authorization>
|
<authorization>
|
||||||
<deny users="*"/>
|
<deny users="*"/>
|
||||||
</authorization>
|
</authorization>
|
||||||
</system.web>
|
</system.web>
|
||||||
</location>
|
</location>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user