Skip to content

Indent with spaces to follow PSR-2 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Indent with spaces to follow PSR-2 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Guardfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
guard :phpunit, :all_on_start => false, :tests_path => 'tests/', :cli => '--colors -c build/phpunit.xml' do
# Run any test in app/tests upon save.
watch(%r{^.+Test\.php$})
# Run any test in app/tests upon save.
watch(%r{^.+Test\.php$})

# When a file is edited, try to run its associated test.
watch(%r{^src/(.+)/(.+)\.php$}) { |m| "tests/#{m[2]}Test.php"}
# When a file is edited, try to run its associated test.
watch(%r{^src/(.+)/(.+)\.php$}) { |m| "tests/#{m[2]}Test.php"}
end
28 changes: 14 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ To install through composer, simply put the following in your `composer.json` fi

```json
{
"require-dev": {
"orchestra/testbench": "2.0.*"
}
"require-dev": {
"orchestra/testbench": "2.0.*"
}
}
```

Expand Down Expand Up @@ -44,10 +44,10 @@ To load your package service provider, override the `getPackageProviders`.

```php

protected function getPackageProviders()
{
return array('Acme\AcmeServiceProvider');
}
protected function getPackageProviders()
{
return array('Acme\AcmeServiceProvider');
}
```

### Custom Aliases
Expand All @@ -56,12 +56,12 @@ To load your package alias, override the `getPackageAliases`.

```php

protected function getPackageAliases()
{
return array(
'Acme' => 'Acme\Facade'
);
}
protected function getPackageAliases()
{
return array(
'Acme' => 'Acme\Facade'
);
}
```

## Testing Route Filters
Expand All @@ -75,6 +75,6 @@ $this->app['router']->enableFilters();

## Working with Workbench

Fatal error: Class 'Illuminate\Foundation\Testing\TestCase' not found in /laravel/workbench/foo/bar/vendor/orchestra/testbench/src/Orchestra/Testbench/TestCase.php
Fatal error: Class 'Illuminate\Foundation\Testing\TestCase' not found in /laravel/workbench/foo/bar/vendor/orchestra/testbench/src/Orchestra/Testbench/TestCase.php

Due to the requirement to include `laravel/framework` when you install `orchestra/testbench`, please remove any **Illuminate** dependencies to avoid a failed installation.
6 changes: 3 additions & 3 deletions build/phpcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ruleset name="name-of-your-coding-standard">
<description>PSR2 Compliant</description>
<rule ref="PSR2"/>
<rule ref="Generic.PHP.DisallowShortOpenTag"/>
<description>PSR2 Compliant</description>
<rule ref="PSR2"/>
<rule ref="Generic.PHP.DisallowShortOpenTag"/>
</ruleset>
36 changes: 18 additions & 18 deletions build/phpmd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<ruleset name="standard"
xmlns="http://pmd.sf.net/ruleset/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
http://pmd.sf.net/ruleset_xml_schema.xsd"
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
<description>Description of your coding standard</description>
xmlns="http://pmd.sf.net/ruleset/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
http://pmd.sf.net/ruleset_xml_schema.xsd"
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
<description>Description of your coding standard</description>

<rule ref="rulesets/codesize.xml" />
<rule ref="rulesets/unusedcode.xml" />
<rule ref="rulesets/codesize.xml" />
<rule ref="rulesets/unusedcode.xml" />

<rule ref="rulesets/design.xml/CouplingBetweenObjects" />
<rule ref="rulesets/design.xml/EvalExpression" />
<rule ref="rulesets/design.xml/ExitExpression" />
<rule ref="rulesets/design.xml/GotoStatement" />
<rule ref="rulesets/design.xml/CouplingBetweenObjects" />
<rule ref="rulesets/design.xml/EvalExpression" />
<rule ref="rulesets/design.xml/ExitExpression" />
<rule ref="rulesets/design.xml/GotoStatement" />

<rule ref="rulesets/naming.xml/ConstantNamingConventions" />
<!--
<rule ref="rulesets/naming.xml/BooleanGetMethodName" />
<rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
-->
<rule ref="rulesets/naming.xml/ConstantNamingConventions" />
<!--
<rule ref="rulesets/naming.xml/BooleanGetMethodName" />
<rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
-->
</ruleset>
52 changes: 26 additions & 26 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "orchestra/testbench",
"description": "Laravel 4 Package Unit Testing Helper",
"keywords": ["laravel"],
"license": "MIT",
"authors": [
{
"name": "Mior Muhammad Zaki",
"email": "crynobone@gmail.com",
"homepage": "https://github.com/crynobone"
}
],
"autoload": {
"psr-0": {
"Orchestra\\Testbench" : "src/"
}
},
"require": {
"php": ">=5.3.3",
"laravel/framework": "4.0.*"
},
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"minimum-stability": "dev"
"name": "orchestra/testbench",
"description": "Laravel 4 Package Unit Testing Helper",
"keywords": ["laravel"],
"license": "MIT",
"authors": [
{
"name": "Mior Muhammad Zaki",
"email": "crynobone@gmail.com",
"homepage": "https://github.com/crynobone"
}
],
"autoload": {
"psr-0": {
"Orchestra\\Testbench" : "src/"
}
},
"require": {
"php": ">=5.3.3",
"laravel/framework": "4.0.*"
},
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"minimum-stability": "dev"
}
26 changes: 13 additions & 13 deletions docs/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ To install through composer, simply put the following in your `composer.json` fi

```json
{
"require-dev": {
"orchestra/testbench": "2.0.*"
}
"require-dev": {
"orchestra/testbench": "2.0.*"
}
}
```

Expand Down Expand Up @@ -39,10 +39,10 @@ To load your package service provider, override the `getPackageProviders`.

```php

protected function getPackageProviders()
{
return array('Acme\AcmeServiceProvider');
}
protected function getPackageProviders()
{
return array('Acme\AcmeServiceProvider');
}
```

### Custom Aliases
Expand All @@ -51,12 +51,12 @@ To load your package alias, override the `getPackageAliases`.

```php

protected function getPackageAliases()
{
return array(
'Acme' => 'Acme\Facade'
);
}
protected function getPackageAliases()
{
return array(
'Acme' => 'Acme\Facade'
);
}
```

## Testing Route Filters
Expand Down
132 changes: 66 additions & 66 deletions src/fixture/app/config/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,82 +2,82 @@

return array(

/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/
/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/

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

/*
|--------------------------------------------------------------------------
| Application URL
|--------------------------------------------------------------------------
|
| This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of
| your application so that it is used when running Artisan tasks.
|
*/
/*
|--------------------------------------------------------------------------
| Application URL
|--------------------------------------------------------------------------
|
| This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of
| your application so that it is used when running Artisan tasks.
|
*/

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

/*
|--------------------------------------------------------------------------
| Application Timezone
|--------------------------------------------------------------------------
|
| Here you may specify the default timezone for your application, which
| will be used by the PHP date and date-time functions. We have gone
| ahead and set this to a sensible default for you out of the box.
|
*/
/*
|--------------------------------------------------------------------------
| Application Timezone
|--------------------------------------------------------------------------
|
| Here you may specify the default timezone for your application, which
| will be used by the PHP date and date-time functions. We have gone
| ahead and set this to a sensible default for you out of the box.
|
*/

'timezone' => 'UTC',
'timezone' => 'UTC',

/*
|--------------------------------------------------------------------------
| Application Locale Configuration
|--------------------------------------------------------------------------
|
| The application locale determines the default locale that will be used
| by the translation service provider. You are free to set this value
| to any of the locales which will be supported by the application.
|
*/
/*
|--------------------------------------------------------------------------
| Application Locale Configuration
|--------------------------------------------------------------------------
|
| The application locale determines the default locale that will be used
| by the translation service provider. You are free to set this value
| to any of the locales which will be supported by the application.
|
*/

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

/*
|--------------------------------------------------------------------------
| Encryption Key
|--------------------------------------------------------------------------
|
| This key is used by the Illuminate encrypter service and should be set
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
|
*/
/*
|--------------------------------------------------------------------------
| Encryption Key
|--------------------------------------------------------------------------
|
| This key is used by the Illuminate encrypter service and should be set
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
|
*/

'key' => 'YourSecretKey!!!',
'key' => 'YourSecretKey!!!',

/*
|--------------------------------------------------------------------------
| Service Provider Manifest
|--------------------------------------------------------------------------
|
| The service provider manifest is used by Laravel to lazy load service
| providers which are not needed for each request, as well to keep a
| list of all of the services. Here, you may set its storage spot.
|
*/
/*
|--------------------------------------------------------------------------
| Service Provider Manifest
|--------------------------------------------------------------------------
|
| The service provider manifest is used by Laravel to lazy load service
| providers which are not needed for each request, as well to keep a
| list of all of the services. Here, you may set its storage spot.
|
*/

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

);
Loading