Skip to content

Commit

Permalink
fintech-fab#17 Исправление форматирования app.php и composer.json
Browse files Browse the repository at this point in the history
  • Loading branch information
kmarenov committed Sep 9, 2014
1 parent e179bac commit 5bd2e25
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 107 deletions.
90 changes: 45 additions & 45 deletions app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
|
*/

'debug' => true,
'debug' => true,

/*
|--------------------------------------------------------------------------
Expand All @@ -26,7 +26,7 @@
|
*/

'url' => 'http://localhost',
'url' => 'http://localhost',

/*
|--------------------------------------------------------------------------
Expand All @@ -39,7 +39,7 @@
|
*/

'timezone' => 'Europe/Moscow',
'timezone' => 'Europe/Moscow',

/*
|--------------------------------------------------------------------------
Expand All @@ -52,7 +52,7 @@
|
*/

'locale' => 'en',
'locale' => 'en',

/*
|--------------------------------------------------------------------------
Expand All @@ -65,7 +65,7 @@
|
*/

'key' => 'IqdV4PFLy4kavKpKvG8rR1gzoRGRqEcn',
'key' => 'IqdV4PFLy4kavKpKvG8rR1gzoRGRqEcn',

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -128,7 +128,7 @@
|
*/

'manifest' => storage_path() . '/meta',
'manifest' => storage_path() . '/meta',

/*
|--------------------------------------------------------------------------
Expand All @@ -140,46 +140,46 @@
| the aliases are "lazy" loaded so they don't hinder performance.
|
*/
// ой беда-беда. автоформат выключен или настройки автоформата не загружены в IDE
'aliases' => array(

'App' => 'Illuminate\Support\Facades\App',
'Artisan' => 'Illuminate\Support\Facades\Artisan',
'Auth' => 'Illuminate\Support\Facades\Auth',
'Blade' => 'Illuminate\Support\Facades\Blade',
'Cache' => 'Illuminate\Support\Facades\Cache',

'aliases' => array(

'App' => 'Illuminate\Support\Facades\App',
'Artisan' => 'Illuminate\Support\Facades\Artisan',
'Auth' => 'Illuminate\Support\Facades\Auth',
'Blade' => 'Illuminate\Support\Facades\Blade',
'Cache' => 'Illuminate\Support\Facades\Cache',
'ClassLoader' => 'Illuminate\Support\ClassLoader',
'Config' => 'Illuminate\Support\Facades\Config',
'Controller' => 'Illuminate\Routing\Controller',
'Cookie' => 'Illuminate\Support\Facades\Cookie',
'Crypt' => 'Illuminate\Support\Facades\Crypt',
'DB' => 'Illuminate\Support\Facades\DB',
'Eloquent' => 'Illuminate\Database\Eloquent\Model',
'Event' => 'Illuminate\Support\Facades\Event',
'File' => 'Illuminate\Support\Facades\File',
'Form' => 'Illuminate\Support\Facades\Form',
'Hash' => 'Illuminate\Support\Facades\Hash',
'HTML' => 'Illuminate\Support\Facades\HTML',
'Input' => 'Illuminate\Support\Facades\Input',
'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log',
'Mail' => 'Illuminate\Support\Facades\Mail',
'Paginator' => 'Illuminate\Support\Facades\Paginator',
'Password' => 'Illuminate\Support\Facades\Password',
'Queue' => 'Illuminate\Support\Facades\Queue',
'Redirect' => 'Illuminate\Support\Facades\Redirect',
'Redis' => 'Illuminate\Support\Facades\Redis',
'Request' => 'Illuminate\Support\Facades\Request',
'Response' => 'Illuminate\Support\Facades\Response',
'Route' => 'Illuminate\Support\Facades\Route',
'Schema' => 'Illuminate\Support\Facades\Schema',
'Seeder' => 'Illuminate\Database\Seeder',
'Session' => 'Illuminate\Support\Facades\Session',
'SSH' => 'Illuminate\Support\Facades\SSH',
'Str' => 'Illuminate\Support\Str',
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
'Config' => 'Illuminate\Support\Facades\Config',
'Controller' => 'Illuminate\Routing\Controller',
'Cookie' => 'Illuminate\Support\Facades\Cookie',
'Crypt' => 'Illuminate\Support\Facades\Crypt',
'DB' => 'Illuminate\Support\Facades\DB',
'Eloquent' => 'Illuminate\Database\Eloquent\Model',
'Event' => 'Illuminate\Support\Facades\Event',
'File' => 'Illuminate\Support\Facades\File',
'Form' => 'Illuminate\Support\Facades\Form',
'Hash' => 'Illuminate\Support\Facades\Hash',
'HTML' => 'Illuminate\Support\Facades\HTML',
'Input' => 'Illuminate\Support\Facades\Input',
'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log',
'Mail' => 'Illuminate\Support\Facades\Mail',
'Paginator' => 'Illuminate\Support\Facades\Paginator',
'Password' => 'Illuminate\Support\Facades\Password',
'Queue' => 'Illuminate\Support\Facades\Queue',
'Redirect' => 'Illuminate\Support\Facades\Redirect',
'Redis' => 'Illuminate\Support\Facades\Redis',
'Request' => 'Illuminate\Support\Facades\Request',
'Response' => 'Illuminate\Support\Facades\Response',
'Route' => 'Illuminate\Support\Facades\Route',
'Schema' => 'Illuminate\Support\Facades\Schema',
'Seeder' => 'Illuminate\Database\Seeder',
'Session' => 'Illuminate\Support\Facades\Session',
'SSH' => 'Illuminate\Support\Facades\SSH',
'Str' => 'Illuminate\Support\Str',
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',

),

Expand Down
124 changes: 62 additions & 62 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
{
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {

"laravel/framework": "4.2.*",
"codesleeve/asset-pipeline": "dev-master",
"iron-io/iron_mq": "dev-master",
"pda/pheanstalk": "2.*@dev",
"laravel/framework": "4.2.*",
"codesleeve/asset-pipeline": "dev-master",
"iron-io/iron_mq": "dev-master",
"pda/pheanstalk": "2.*@dev",

"fintech-fab/bank-emulator": "dev-master",
"fintech-fab/money-transfer-emulator": "dev-master",
"fintech-fab/bank-emulator": "dev-master",
"fintech-fab/money-transfer-emulator": "dev-master",

"fintech-fab/qiwi-shop": "dev-master",
"fintech-fab/qiwi-gate": "dev-master",
"fintech-fab/qiwi-sdk": "dev-master"
"fintech-fab/qiwi-shop": "dev-master",
"fintech-fab/qiwi-gate": "dev-master",
"fintech-fab/qiwi-sdk": "dev-master"

},
"require-examples": {
"fintech-fab/bank-emulator-sdk": "dev-master",
"money-transfer-emulator-sdk": "dev-master"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "dev-master",
"phpunit/php-code-coverage": "~2.0",
"phpunit/phpunit-mock-objects": "2.3.*@dev",
"phpunit/phpunit": "4.3.*@dev",
"zizaco/factory-muff": "dev-master",
"mockery/mockery": "0.9.*",
"maatwebsite/excel": "1.*"
},
"autoload": {
"classmap": [
"app/commands",
"app/controllers",
"app/models",
"app/database/migrations",
"app/database/seeds",
"app/tests/TestCase.php"
],
"psr-0": {
"FintechFab": "app/"
}
},
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan ide-helper:generate",
"php artisan optimize"
],
"post-create-project-cmd": [
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist",
"github-oauth": {
"github.com": "57b13bc22c26e533040d24b50ef8d910f44bcafa"
}
},
"minimum-stability": "stable"
},
"require-examples": {
"fintech-fab/bank-emulator-sdk": "dev-master",
"money-transfer-emulator-sdk": "dev-master"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "dev-master",
"phpunit/php-code-coverage": "~2.0",
"phpunit/phpunit-mock-objects": "2.3.*@dev",
"phpunit/phpunit": "4.3.*@dev",
"zizaco/factory-muff": "dev-master",
"mockery/mockery": "0.9.*",
"maatwebsite/excel": "1.*"
},
"autoload": {
"classmap": [
"app/commands",
"app/controllers",
"app/models",
"app/database/migrations",
"app/database/seeds",
"app/tests/TestCase.php"
],
"psr-0": {
"FintechFab": "app/"
}
},
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan ide-helper:generate",
"php artisan optimize"
],
"post-create-project-cmd": [
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist",
"github-oauth": {
"github.com": "57b13bc22c26e533040d24b50ef8d910f44bcafa"
}
},
"minimum-stability": "stable"
}

0 comments on commit 5bd2e25

Please sign in to comment.