Skip to content

Commit

Permalink
Merge 3f458df into 18aff40
Browse files Browse the repository at this point in the history
  • Loading branch information
JayBizzle committed Apr 12, 2018
2 parents 18aff40 + 3f458df commit 1b9ef6f
Show file tree
Hide file tree
Showing 11 changed files with 120 additions and 63 deletions.
4 changes: 3 additions & 1 deletion .coveralls.yml
@@ -1 +1,3 @@
service_name: travis-ci
coverage_clover: tests/logs/clover.xml
json_path: tests/logs/coveralls-upload.json
service_name: travis-ci
65 changes: 65 additions & 0 deletions .styleci.yml
@@ -0,0 +1,65 @@
preset: none
enabled:
- array_element_white_space_after_comma
- blankline_after_open_tag
- braces
- concat_without_spaces
- double_arrow_multiline_whitespaces
- duplicate_semicolon
- elseif
- empty_return
- encoding
- eof_ending
- function_call_space
- function_declaration
- include
- indentation
- join_function
- line_after_namespace
- linefeed
- list_commas
- logical_not_operators_with_successor_space
- long_array_syntax
- lowercase_constants
- lowercase_keywords
- method_argument_space
- multiline_array_trailing_comma
- multiline_spaces_before_semicolon
- multiple_use
- namespace_no_leading_whitespace
- no_blank_lines_after_class_opening
- no_empty_lines_after_phpdocs
- no_extra_consecutive_blank_lines
- object_operator
- operators_spaces
- length_ordered_imports
- parenthesis
- phpdoc_indent
- phpdoc_inline_tag
- phpdoc_no_access
- phpdoc_no_package
- phpdoc_scalar
- phpdoc_short_description
- phpdoc_to_comment
- phpdoc_trim
- phpdoc_type_to_var
- phpdoc_var_without_name
- remove_leading_slash_use
- return
- self_accessor
- short_echo_tag
- short_tag
- single_array_no_trailing_comma
- single_blank_line_before_namespace
- single_line_after_imports
- single_quote
- spaces_before_semicolon
- spaces_cast
- standardize_not_equal
- ternary_spaces
- trailing_spaces
- trim_array_spaces
- unalign_equals
- unary_operators_spaces
- visibility
- whitespacy_lines
36 changes: 26 additions & 10 deletions .travis.yml
@@ -1,14 +1,30 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1

before_script:
cache:
directories:
- $HOME/.composer/cache

matrix:
include:
- php: 5.4
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
- php: 7.2
- php: nightly
allow_failures:
- php: nightly
fast_finish: true

before_install:
- travis_retry composer self-update
- travis_retry composer install --prefer-source --no-interaction --dev

script: phpunit
install:
- composer install --no-interaction --prefer-dist --no-suggest

script:
- ./vendor/bin/phpunit --coverage-clover ./tests/logs/clover.xml

after_script:
- php vendor/bin/coveralls -v
10 changes: 6 additions & 4 deletions composer.json
Expand Up @@ -12,15 +12,17 @@
],
"require": {
"php": ">=5.4.0",
"illuminate/support": "~5.0",
"illuminate/config": "~5.0"
"illuminate/support": "^5.0",
"illuminate/config": "^5.0"
},
"require-dev": {
"orchestra/testbench": "3.0.*"
"orchestra/testbench": "^3.0",
"phpunit/phpunit": "^4.8|^5.5|^6.5",
"satooshi/php-coveralls": "1.*"
},
"autoload": {
"psr-4": {
"Jaybizzle\\": "src/Jaybizzle"
"Jaybizzle\\Safeurl\\": "src/"
}
},
"minimum-stability": "stable"
Expand Down
18 changes: 18 additions & 0 deletions src/Facades/Safeurl.php
@@ -0,0 +1,18 @@
<?php

namespace Jaybizzle\Safeurl\Facades;

use Illuminate\Support\Facades\Facade;

class Safeurl extends Facade
{
/**
* Get the registered name of the component.
*
* @return string
*/
protected static function getFacadeAccessor()
{
return 'safeurl';
}
}
18 changes: 0 additions & 18 deletions src/Jaybizzle/Safeurl/Facades/Safeurl.php

This file was deleted.

22 changes: 0 additions & 22 deletions src/LICENSE

This file was deleted.

4 changes: 0 additions & 4 deletions src/README.md

This file was deleted.

File renamed without changes.
Expand Up @@ -21,10 +21,10 @@ class SafeurlServiceProvider extends ServiceProvider
public function boot()
{
$this->publishes(array(
__DIR__.'/../../config/config.php' => base_path('config/safeurl.php'),
__DIR__.'/config/config.php' => base_path('config/safeurl.php'),
));

$this->mergeConfigFrom(__DIR__.'/../../config/config.php', 'safeurl');
$this->mergeConfigFrom(__DIR__.'/config/config.php', 'safeurl');
}

/**
Expand Down
2 changes: 0 additions & 2 deletions src/config/config.php
Expand Up @@ -75,6 +75,4 @@

),



);

0 comments on commit 1b9ef6f

Please sign in to comment.