Skip to content

Commit

Permalink
Laravel 7
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Jan 25, 2020
1 parent 7c003d9 commit 7c12980
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
.phpunit.result.cache
composer.lock
phpunit.xml
vendor
20 changes: 19 additions & 1 deletion .travis.yml
Expand Up @@ -56,6 +56,12 @@ matrix:
- LARAVEL_VERSION=^6.0
- SYMFONY_VERSION=^4.0
- PHPUNIT_VERSION=^8.0
- name: PHP 7.2; Laravel 7
env:
- PHP_VERSION=7.2
- LARAVEL_VERSION=^7.0
- SYMFONY_VERSION=^5.0
- PHPUNIT_VERSION=^8.0
- name: PHP 7.3; Laravel 5.5
env:
- PHP_VERSION=7.3
Expand Down Expand Up @@ -86,6 +92,12 @@ matrix:
- LARAVEL_VERSION=^6.0
- SYMFONY_VERSION=^4.0
- PHPUNIT_VERSION=^8.0
- name: PHP 7.3; Laravel 7
env:
- PHP_VERSION=7.3
- LARAVEL_VERSION=^7.0
- SYMFONY_VERSION=^5.0
- PHPUNIT_VERSION=^8.0
- name: PHP 7.4; Laravel 5.5
env:
- PHP_VERSION=7.4
Expand Down Expand Up @@ -116,11 +128,17 @@ matrix:
- LARAVEL_VERSION=^6.0
- SYMFONY_VERSION=^4.0
- PHPUNIT_VERSION=^8.0
- name: PHP 7.4; Laravel 7
env:
- PHP_VERSION=7.4
- LARAVEL_VERSION=^7.0
- SYMFONY_VERSION=^5.0
- PHPUNIT_VERSION=^8.0

before_install:
- travis_retry docker pull registry.gitlab.com/grahamcampbell/php:$PHP_VERSION
- docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "laravel/framework:${LARAVEL_VERSION}" --no-update -n
- docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "symfony/lts:${SYMFONY_VERSION}" --no-update -n
- if [ "$SYMFONY_VERSION" != "^5.0" ]; then docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "symfony/lts:${SYMFONY_VERSION}" --no-update -n; fi
- docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update -n

install:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2019 Graham Campbell <graham@alt-three.com>
Copyright (c) 2013-2020 Graham Campbell <graham@alt-three.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,7 +1,7 @@
Laravel Security
================

Laravel Security was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a [voku/anti-xss](https://github.com/voku/anti-xss) wrapper for [Laravel 5](http://laravel.com), using [graham-campbell/security-core](https://github.com/GrahamCampbell/Security-Core). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-Security/releases), [security policy](https://github.com/GrahamCampbell/Laravel-Security/security/policy), [license](LICENSE), [code of conduct](.github/CODE_OF_CONDUCT.md), and [contribution guidelines](.github/CONTRIBUTING.md).
Laravel Security was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a [voku/anti-xss](https://github.com/voku/anti-xss) wrapper for [Laravel](http://laravel.com), using [graham-campbell/security-core](https://github.com/GrahamCampbell/Security-Core). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-Security/releases), [security policy](https://github.com/GrahamCampbell/Laravel-Security/security/policy), [license](LICENSE), [code of conduct](.github/CODE_OF_CONDUCT.md), and [contribution guidelines](.github/CONTRIBUTING.md).

![Banner](https://user-images.githubusercontent.com/2829600/71477506-68a5a600-27e2-11ea-8c23-84dc5b8e3915.png)

Expand All @@ -17,7 +17,7 @@ Laravel Security was created by, and is maintained by [Graham Campbell](https://

## Installation

Laravel Security requires [PHP](https://php.net) 7.1-7.4. This particular version supports Laravel 5.5-5.8 and 6 only.
Laravel Security requires [PHP](https://php.net) 7.1-7.4. This particular version supports Laravel 5.5-7.

To get the latest version, simply require the project using [Composer](https://getcomposer.org):

Expand Down
12 changes: 6 additions & 6 deletions composer.json
@@ -1,6 +1,6 @@
{
"name": "graham-campbell/security",
"description": "Security Is An Anti-XSS Wrapper For Laravel 5",
"description": "Security Is An Anti-XSS Wrapper For Laravel",
"keywords": ["laravel", "framework", "security", "xss", "anti-xss", "Security", "Laravel Security", "Laravel-Security", "Graham Campbell", "GrahamCampbell"],
"license": "MIT",
"authors": [
Expand All @@ -12,12 +12,12 @@
"require": {
"php": "^7.1.3",
"graham-campbell/security-core": "^2.0",
"illuminate/contracts": "^5.5|^6.0",
"illuminate/support": "^5.5|^6.0"
"illuminate/contracts": "^5.5|^6.0|^7.0",
"illuminate/support": "^5.5|^6.0|^7.0"
},
"require-dev": {
"graham-campbell/analyzer": "^2.1",
"graham-campbell/testbench": "^5.2",
"graham-campbell/analyzer": "^2.4",
"graham-campbell/testbench": "^5.4",
"phpunit/phpunit": "^6.5|^7.0|^8.0"
},
"autoload": {
Expand All @@ -35,7 +35,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.0-dev"
"dev-master": "7.1-dev"
},
"laravel": {
"providers": [
Expand Down

0 comments on commit 7c12980

Please sign in to comment.