Skip to content

Commit

Permalink
Fixed line-endings
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbyoung committed Oct 21, 2017
1 parent 9f7dd29 commit ac55f55
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 63 deletions.
102 changes: 51 additions & 51 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
{
"name": "opulence/opulencewebsite",
"description": "The Opulence flagship website",
"authors": [
{
"name": "David Young",
"email": "dbyoung2@gmail.com",
"role": "Architect"
}
],
"autoload": {
"psr-4": {
"Project\\": [
"src",
"tests/src"
]
}
},
"require": {
"php": "^7.1",
"erusev/parsedown": "1.6.1",
"monolog/monolog": "1.22.0",
"opulence/opulence": "1.1.x-dev",
"sami/sami": "3.2.*@dev"
},
"require-dev": {
"phpunit/phpunit": "~6.2"
},
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"scripts": {
"post-create-project-cmd": [
"php -r \"copy('config/environment/.env.example.php', 'config/environment/.env.app.php');\"",
"php apex encryption:generatekey"
],
"post-install-cmd": [
"php -r \"shell_exec((file_exists(getcwd() . '/composer.phar') ? PHP_BINARY . ' composer.phar' : 'composer') . ' dump-autoload -o');\"",
"php -r \"file_exists('config/environment/.env.app.php') || copy('config/environment/.env.example.php', 'config/environment/.env.app.php');\"",
"php apex framework:flushcache"
],
"post-update-cmd": [
"php -r \"shell_exec((file_exists(getcwd() . '/composer.phar') ? PHP_BINARY . ' composer.phar' : 'composer') . ' dump-autoload -o');\"",
"php -r \"file_exists('config/environment/.env.app.php') || copy('config/environment/.env.example.php', 'config/environment/.env.app.php');\"",
"php apex framework:flushcache"
]
},
"minimum-stability": "dev"
}
{
"name": "opulence/opulencewebsite",
"description": "The Opulence flagship website",
"authors": [
{
"name": "David Young",
"email": "dbyoung2@gmail.com",
"role": "Architect"
}
],
"autoload": {
"psr-4": {
"Project\\": [
"src",
"tests/src"
]
}
},
"require": {
"php": "^7.1",
"erusev/parsedown": "1.6.1",
"monolog/monolog": "1.22.0",
"opulence/opulence": "1.1.x-dev",
"sami/sami": "3.2.*@dev"
},
"require-dev": {
"phpunit/phpunit": "~6.2"
},
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"scripts": {
"post-create-project-cmd": [
"php -r \"copy('config/environment/.env.example.php', 'config/environment/.env.app.php');\"",
"php apex encryption:generatekey"
],
"post-install-cmd": [
"php -r \"shell_exec((file_exists(getcwd() . '/composer.phar') ? PHP_BINARY . ' composer.phar' : 'composer') . ' dump-autoload -o');\"",
"php -r \"file_exists('config/environment/.env.app.php') || copy('config/environment/.env.example.php', 'config/environment/.env.app.php');\"",
"php apex framework:flushcache"
],
"post-update-cmd": [
"php -r \"shell_exec((file_exists(getcwd() . '/composer.phar') ? PHP_BINARY . ' composer.phar' : 'composer') . ' dump-autoload -o');\"",
"php -r \"file_exists('config/environment/.env.app.php') || copy('config/environment/.env.example.php', 'config/environment/.env.app.php');\"",
"php apex framework:flushcache"
]
},
"minimum-stability": "dev"
}
24 changes: 12 additions & 12 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<phpunit
bootstrap="vendor/autoload.php"
colors="true">
<testsuite name="OpulenceWebsite">
<directory>tests</directory>
</testsuite>
<php>
<env name="ENV_NAME" value="testing"/>
<env name="ENCRYPTION_KEY" value="74a64db2018d928d351d7bdd257c410efa938a010bc32bcd789155fd8cd75eb9"/>
<env name="SESSION_HANDLER" value="Opulence\Sessions\Handlers\ArraySessionHandler"/>
<env name="VIEW_CACHE" value="Opulence\Views\Caching\ArrayCache"/>
</php>
<phpunit
bootstrap="vendor/autoload.php"
colors="true">
<testsuite name="OpulenceWebsite">
<directory>tests</directory>
</testsuite>
<php>
<env name="ENV_NAME" value="testing"/>
<env name="ENCRYPTION_KEY" value="74a64db2018d928d351d7bdd257c410efa938a010bc32bcd789155fd8cd75eb9"/>
<env name="SESSION_HANDLER" value="Opulence\Sessions\Handlers\ArraySessionHandler"/>
<env name="VIEW_CACHE" value="Opulence\Views\Caching\ArrayCache"/>
</php>
</phpunit>

0 comments on commit ac55f55

Please sign in to comment.