Laravel version update
Laravel version update
This commit is contained in:
25
vendor/zendframework/zend-escaper/CHANGELOG.md
vendored
25
vendor/zendframework/zend-escaper/CHANGELOG.md
vendored
@@ -2,6 +2,31 @@
|
||||
|
||||
All notable changes to this project will be documented in this file, in reverse chronological order by release.
|
||||
|
||||
## 2.6.0 - 2018-04-25
|
||||
|
||||
### Added
|
||||
|
||||
- [#28](https://github.com/zendframework/zend-escaper/pull/28) adds support for PHP 7.1 and 7.2.
|
||||
|
||||
### Changed
|
||||
|
||||
- [#25](https://github.com/zendframework/zend-escaper/pull/25) changes the behavior of the `Escaper` constructor; it now raises an
|
||||
exception for non-null, non-string `$encoding` arguments.
|
||||
|
||||
### Deprecated
|
||||
|
||||
- Nothing.
|
||||
|
||||
### Removed
|
||||
|
||||
- [#28](https://github.com/zendframework/zend-escaper/pull/28) removes support for PHP 5.5.
|
||||
|
||||
- [#28](https://github.com/zendframework/zend-escaper/pull/28) removes support for HHVM.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Nothing.
|
||||
|
||||
## 2.5.2 - 2016-06-30
|
||||
|
||||
### Added
|
||||
|
43
vendor/zendframework/zend-escaper/CONDUCT.md
vendored
43
vendor/zendframework/zend-escaper/CONDUCT.md
vendored
@@ -1,43 +0,0 @@
|
||||
# Contributor Code of Conduct
|
||||
|
||||
The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
|
||||
as its guidelines for contributor interactions.
|
||||
|
||||
## The Code Manifesto
|
||||
|
||||
We want to work in an ecosystem that empowers developers to reach their
|
||||
potential — one that encourages growth and effective collaboration. A space that
|
||||
is safe for all.
|
||||
|
||||
A space such as this benefits everyone that participates in it. It encourages
|
||||
new developers to enter our field. It is through discussion and collaboration
|
||||
that we grow, and through growth that we improve.
|
||||
|
||||
In the effort to create such a place, we hold to these values:
|
||||
|
||||
1. **Discrimination limits us.** This includes discrimination on the basis of
|
||||
race, gender, sexual orientation, gender identity, age, nationality, technology
|
||||
and any other arbitrary exclusion of a group of people.
|
||||
2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
|
||||
levels. Remember that, and if brought to your attention, heed it.
|
||||
3. **We are our biggest assets.** None of us were born masters of our trade.
|
||||
Each of us has been helped along the way. Return that favor, when and where
|
||||
you can.
|
||||
4. **We are resources for the future.** As an extension of #3, share what you
|
||||
know. Make yourself a resource to help those that come after you.
|
||||
5. **Respect defines us.** Treat others as you wish to be treated. Make your
|
||||
discussions, criticisms and debates from a position of respectfulness. Ask
|
||||
yourself, is it true? Is it necessary? Is it constructive? Anything less is
|
||||
unacceptable.
|
||||
6. **Reactions require grace.** Angry responses are valid, but abusive language
|
||||
and vindictive actions are toxic. When something happens that offends you,
|
||||
handle it assertively, but be respectful. Escalate reasonably, and try to
|
||||
allow the offender an opportunity to explain themselves, and possibly correct
|
||||
the issue.
|
||||
7. **Opinions are just that: opinions.** Each and every one of us, due to our
|
||||
background and upbringing, have varying opinions. The fact of the matter, is
|
||||
that is perfectly acceptable. Remember this: if you respect your own
|
||||
opinions, you should respect the opinions of others.
|
||||
8. **To err is human.** You might not intend it, but mistakes do happen and
|
||||
contribute to build experience. Tolerate honest mistakes, and don't hesitate
|
||||
to apologize if you make one yourself.
|
234
vendor/zendframework/zend-escaper/CONTRIBUTING.md
vendored
234
vendor/zendframework/zend-escaper/CONTRIBUTING.md
vendored
@@ -1,234 +0,0 @@
|
||||
# CONTRIBUTING
|
||||
|
||||
## RESOURCES
|
||||
|
||||
If you wish to contribute to Zend Framework, please be sure to
|
||||
read/subscribe to the following resources:
|
||||
|
||||
- [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
|
||||
- [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
|
||||
- ZF Contributor's mailing list:
|
||||
Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
|
||||
Subscribe: zf-contributors-subscribe@lists.zend.com
|
||||
- ZF Contributor's IRC channel:
|
||||
#zftalk.dev on Freenode.net
|
||||
|
||||
If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-escaper/issues/new).
|
||||
|
||||
## Reporting Potential Security Issues
|
||||
|
||||
If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
|
||||
issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
|
||||
We will work with you to verify the vulnerability and patch it as soon as possible.
|
||||
|
||||
When reporting issues, please provide the following information:
|
||||
|
||||
- Component(s) affected
|
||||
- A description indicating how to reproduce the issue
|
||||
- A summary of the security vulnerability and impact
|
||||
|
||||
We request that you contact us via the email address above and give the project
|
||||
contributors a chance to resolve the vulnerability and issue a new release prior
|
||||
to any public exposure; this helps protect users and provides them with a chance
|
||||
to upgrade and/or update in order to protect their applications.
|
||||
|
||||
For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
|
||||
|
||||
## RUNNING TESTS
|
||||
|
||||
> ### Note: testing versions prior to 2.4
|
||||
>
|
||||
> This component originates with Zend Framework 2. During the lifetime of ZF2,
|
||||
> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
|
||||
> changes were necessary. However, due to the migration, tests may not run on
|
||||
> versions < 2.4. As such, you may need to change the PHPUnit dependency if
|
||||
> attempting a fix on such a version.
|
||||
|
||||
To run tests:
|
||||
|
||||
- Clone the repository:
|
||||
|
||||
```console
|
||||
$ git clone git@github.com:zendframework/zend-escaper.git
|
||||
$ cd
|
||||
```
|
||||
|
||||
- Install dependencies via composer:
|
||||
|
||||
```console
|
||||
$ curl -sS https://getcomposer.org/installer | php --
|
||||
$ ./composer.phar install
|
||||
```
|
||||
|
||||
If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
|
||||
|
||||
- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
|
||||
|
||||
```console
|
||||
$ ./vendor/bin/phpunit
|
||||
```
|
||||
|
||||
You can turn on conditional tests with the phpunit.xml file.
|
||||
To do so:
|
||||
|
||||
- Copy `phpunit.xml.dist` file to `phpunit.xml`
|
||||
- Edit `phpunit.xml` to enable any specific functionality you
|
||||
want to test, as well as to provide test values to utilize.
|
||||
|
||||
## Running Coding Standards Checks
|
||||
|
||||
This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
|
||||
standards checks, and provides configuration for our selected checks.
|
||||
`php-cs-fixer` is installed by default via Composer.
|
||||
|
||||
To run checks only:
|
||||
|
||||
```console
|
||||
$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
|
||||
```
|
||||
|
||||
To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
|
||||
flag:
|
||||
|
||||
```console
|
||||
$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
|
||||
```
|
||||
|
||||
If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
|
||||
they pass, and make sure you add and commit the changes after verification.
|
||||
|
||||
## Recommended Workflow for Contributions
|
||||
|
||||
Your first step is to establish a public repository from which we can
|
||||
pull your work into the master repository. We recommend using
|
||||
[GitHub](https://github.com), as that is where the component is already hosted.
|
||||
|
||||
1. Setup a [GitHub account](http://github.com/), if you haven't yet
|
||||
2. Fork the repository (http://github.com/zendframework/zend-escaper)
|
||||
3. Clone the canonical repository locally and enter it.
|
||||
|
||||
```console
|
||||
$ git clone git://github.com:zendframework/zend-escaper.git
|
||||
$ cd zend-escaper
|
||||
```
|
||||
|
||||
4. Add a remote to your fork; substitute your GitHub username in the command
|
||||
below.
|
||||
|
||||
```console
|
||||
$ git remote add {username} git@github.com:{username}/zend-escaper.git
|
||||
$ git fetch {username}
|
||||
```
|
||||
|
||||
### Keeping Up-to-Date
|
||||
|
||||
Periodically, you should update your fork or personal repository to
|
||||
match the canonical ZF repository. Assuming you have setup your local repository
|
||||
per the instructions above, you can do the following:
|
||||
|
||||
|
||||
```console
|
||||
$ git checkout master
|
||||
$ git fetch origin
|
||||
$ git rebase origin/master
|
||||
# OPTIONALLY, to keep your remote up-to-date -
|
||||
$ git push {username} master:master
|
||||
```
|
||||
|
||||
If you're tracking other branches -- for example, the "develop" branch, where
|
||||
new feature development occurs -- you'll want to do the same operations for that
|
||||
branch; simply substitute "develop" for "master".
|
||||
|
||||
### Working on a patch
|
||||
|
||||
We recommend you do each new feature or bugfix in a new branch. This simplifies
|
||||
the task of code review as well as the task of merging your changes into the
|
||||
canonical repository.
|
||||
|
||||
A typical workflow will then consist of the following:
|
||||
|
||||
1. Create a new local branch based off either your master or develop branch.
|
||||
2. Switch to your new local branch. (This step can be combined with the
|
||||
previous step with the use of `git checkout -b`.)
|
||||
3. Do some work, commit, repeat as necessary.
|
||||
4. Push the local branch to your remote repository.
|
||||
5. Send a pull request.
|
||||
|
||||
The mechanics of this process are actually quite trivial. Below, we will
|
||||
create a branch for fixing an issue in the tracker.
|
||||
|
||||
```console
|
||||
$ git checkout -b hotfix/9295
|
||||
Switched to a new branch 'hotfix/9295'
|
||||
```
|
||||
|
||||
... do some work ...
|
||||
|
||||
|
||||
```console
|
||||
$ git commit
|
||||
```
|
||||
|
||||
... write your log message ...
|
||||
|
||||
|
||||
```console
|
||||
$ git push {username} hotfix/9295:hotfix/9295
|
||||
Counting objects: 38, done.
|
||||
Delta compression using up to 2 threads.
|
||||
Compression objects: 100% (18/18), done.
|
||||
Writing objects: 100% (20/20), 8.19KiB, done.
|
||||
Total 20 (delta 12), reused 0 (delta 0)
|
||||
To ssh://git@github.com/{username}/zend-escaper.git
|
||||
b5583aa..4f51698 HEAD -> master
|
||||
```
|
||||
|
||||
To send a pull request, you have two options.
|
||||
|
||||
If using GitHub, you can do the pull request from there. Navigate to
|
||||
your repository, select the branch you just created, and then select the
|
||||
"Pull Request" button in the upper right. Select the user/organization
|
||||
"zendframework" as the recipient.
|
||||
|
||||
If using your own repository - or even if using GitHub - you can use `git
|
||||
format-patch` to create a patchset for us to apply; in fact, this is
|
||||
**recommended** for security-related patches. If you use `format-patch`, please
|
||||
send the patches as attachments to:
|
||||
|
||||
- zf-devteam@zend.com for patches without security implications
|
||||
- zf-security@zend.com for security patches
|
||||
|
||||
#### What branch to issue the pull request against?
|
||||
|
||||
Which branch should you issue a pull request against?
|
||||
|
||||
- For fixes against the stable release, issue the pull request against the
|
||||
"master" branch.
|
||||
- For new features, or fixes that introduce new elements to the public API (such
|
||||
as new public methods or properties), issue the pull request against the
|
||||
"develop" branch.
|
||||
|
||||
### Branch Cleanup
|
||||
|
||||
As you might imagine, if you are a frequent contributor, you'll start to
|
||||
get a ton of branches both locally and on your remote.
|
||||
|
||||
Once you know that your changes have been accepted to the master
|
||||
repository, we suggest doing some cleanup of these branches.
|
||||
|
||||
- Local branch cleanup
|
||||
|
||||
```console
|
||||
$ git branch -d <branchname>
|
||||
```
|
||||
|
||||
- Remote branch removal
|
||||
|
||||
```console
|
||||
$ git push {username} :<branchname>
|
||||
```
|
||||
|
||||
|
||||
## Conduct
|
||||
|
||||
Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.
|
13
vendor/zendframework/zend-escaper/LICENSE.md
vendored
13
vendor/zendframework/zend-escaper/LICENSE.md
vendored
@@ -1,16 +1,15 @@
|
||||
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
|
||||
|
||||
Copyright (c) 2005-2018, Zend Technologies USA, Inc.
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification,
|
||||
are permitted provided that the following conditions are met:
|
||||
|
||||
- Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
- Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
- Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
- Redistributions in binary form must reproduce the above copyright notice, this
|
||||
list of conditions and the following disclaimer in the documentation and/or
|
||||
other materials provided with the distribution.
|
||||
|
||||
- Neither the name of Zend Technologies USA, Inc. nor the names of its
|
||||
contributors may be used to endorse or promote products derived from this
|
||||
|
4
vendor/zendframework/zend-escaper/README.md
vendored
4
vendor/zendframework/zend-escaper/README.md
vendored
@@ -1,7 +1,7 @@
|
||||
# zend-escaper
|
||||
|
||||
[](https://secure.travis-ci.org/zendframework/zend-escaper)
|
||||
[](https://coveralls.io/r/zendframework/zend-escaper?branch=master)
|
||||
[](https://coveralls.io/github/zendframework/zend-escaper?branch=master)
|
||||
|
||||
The OWASP Top 10 web security risks study lists Cross-Site Scripting (XSS) in
|
||||
second place. PHP’s sole functionality against XSS is limited to two functions
|
||||
@@ -10,4 +10,4 @@ It offers developers a way to escape output and defend from XSS and related
|
||||
vulnerabilities by introducing contextual escaping based on peer-reviewed rules.
|
||||
|
||||
- File issues at https://github.com/zendframework/zend-escaper/issues
|
||||
- Documentation is at https://zendframework.github.io/zend-escaper/
|
||||
- Documentation is at https://docs.zendframework.com/zend-escaper/
|
||||
|
53
vendor/zendframework/zend-escaper/composer.json
vendored
53
vendor/zendframework/zend-escaper/composer.json
vendored
@@ -1,35 +1,54 @@
|
||||
{
|
||||
"name": "zendframework/zend-escaper",
|
||||
"description": " ",
|
||||
"description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
|
||||
"license": "BSD-3-Clause",
|
||||
"keywords": [
|
||||
"zf2",
|
||||
"zf",
|
||||
"zendframework",
|
||||
"escaper"
|
||||
],
|
||||
"homepage": "https://github.com/zendframework/zend-escaper",
|
||||
"support": {
|
||||
"docs": "https://docs.zendframework.com/zend-escaper/",
|
||||
"issues": "https://github.com/zendframework/zend-escaper/issues",
|
||||
"source": "https://github.com/zendframework/zend-escaper",
|
||||
"rss": "https://github.com/zendframework/zend-escaper/releases.atom",
|
||||
"chat": "https://zendframework-slack.herokuapp.com",
|
||||
"forum": "https://discourse.zendframework.com/c/questions/components"
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.6 || ^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
|
||||
"zendframework/zend-coding-standard": "~1.0.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Zend\\Escaper\\": "src/"
|
||||
}
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5"
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"prefer-stable": true,
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.5-dev",
|
||||
"dev-develop": "2.6-dev"
|
||||
}
|
||||
},
|
||||
"autoload-dev": {
|
||||
"psr-4": {
|
||||
"ZendTest\\Escaper\\": "test/"
|
||||
}
|
||||
},
|
||||
"require-dev": {
|
||||
"fabpot/php-cs-fixer": "1.7.*",
|
||||
"phpunit/PHPUnit": "~4.0"
|
||||
"config": {
|
||||
"sort-packages": true
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.6.x-dev",
|
||||
"dev-develop": "2.7.x-dev"
|
||||
}
|
||||
},
|
||||
"scripts": {
|
||||
"check": [
|
||||
"@cs-check",
|
||||
"@test"
|
||||
],
|
||||
"cs-check": "phpcs",
|
||||
"cs-fix": "phpcbf",
|
||||
"test": "phpunit --colors=always",
|
||||
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
|
||||
}
|
||||
}
|
||||
|
@@ -1,21 +0,0 @@
|
||||
# Configuration
|
||||
|
||||
`Zend\Escaper\Escaper` has only one configuration option available, and that is
|
||||
the encoding to be used by the `Escaper` instance.
|
||||
|
||||
The default encoding is **utf-8**. Other supported encodings are:
|
||||
|
||||
- iso-8859-1
|
||||
- iso-8859-5
|
||||
- iso-8859-15
|
||||
- cp866, ibm866, 866
|
||||
- cp1251, windows-1251
|
||||
- cp1252, windows-1252
|
||||
- koi8-r, koi8-ru
|
||||
- big5, big5-hkscs, 950, gb2312, 936
|
||||
- shift\_jis, sjis, sjis-win, cp932
|
||||
- eucjp, eucjp-win
|
||||
- macroman
|
||||
|
||||
If an unsupported encoding is passed to `Zend\Escaper\Escaper`, a
|
||||
`Zend\Escaper\Exception\InvalidArgumentException` will be thrown.
|
@@ -1,74 +0,0 @@
|
||||
# Escaping Cascading Style Sheets
|
||||
|
||||
CSS is similar to [escaping Javascript](escaping-javascript.md). CSS escaping
|
||||
excludes only basic alphanumeric characters and escapes all other characters
|
||||
into valid CSS hexadecimal escapes.
|
||||
|
||||
## Example of Bad CSS Escaping
|
||||
|
||||
In most cases developers forget to escape CSS completely:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
body {
|
||||
background-image: url('http://example.com/foo.jpg?</style><script>alert(1)</script>');
|
||||
}
|
||||
INPUT;
|
||||
?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>Unescaped CSS</title>
|
||||
<meta charset="UTF-8"/>
|
||||
<style>
|
||||
<?= $input ?>
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>User controlled CSS needs to be properly escaped!</p>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
In the above example, by failing to escape the user provided CSS, an attacker
|
||||
can execute an XSS attack fairly easily.
|
||||
|
||||
## Example of Good CSS Escaping
|
||||
|
||||
By using `escapeCss()` method in the CSS context, such attacks can be prevented:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
body {
|
||||
background-image: url('http://example.com/foo.jpg?</style><script>alert(1)</script>');
|
||||
}
|
||||
INPUT;
|
||||
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
$output = $escaper->escapeCss($input);
|
||||
?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>Escaped CSS</title>
|
||||
<meta charset="UTF-8"/>
|
||||
<style>
|
||||
<?php
|
||||
// output will look something like
|
||||
// body\20 \7B \A \20 \20 \20 \20 background\2D image\3A \20 url\28 ...
|
||||
echo $output;
|
||||
?>
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>User controlled CSS needs to be properly escaped!</p>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
By properly escaping user controlled CSS, we can prevent XSS attacks in our web
|
||||
applications.
|
@@ -1,128 +0,0 @@
|
||||
# Escaping HTML Attributes
|
||||
|
||||
Escaping data in **HTML Attribute** contexts is most often done incorrectly, if
|
||||
not overlooked completely by developers. Regular [HTML
|
||||
escaping](escaping-html.md) can be used for escaping HTML attributes *only* if
|
||||
the attribute value can be **guaranteed as being properly quoted**! To avoid
|
||||
confusion, we recommend always using the HTML Attribute escaper method when
|
||||
dealing with HTTP attributes specifically.
|
||||
|
||||
To escape data for an HTML Attribute, use `Zend\Escaper\Escaper`'s
|
||||
`escapeHtmlAttr()` method. Internally it will convert the data to UTF-8, check
|
||||
for its validity, and use an extended set of characters to escape that are not
|
||||
covered by `htmlspecialchars()` to cover the cases where an attribute might be
|
||||
unquoted or quoted illegally.
|
||||
|
||||
## Examples of Bad HTML Attribute Escaping
|
||||
|
||||
An example of incorrect HTML attribute escaping:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: text/html; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
' onmouseover='alert(/ZF2!/);
|
||||
INPUT;
|
||||
|
||||
/**
|
||||
* NOTE: This is equivalent to using htmlspecialchars($input, ENT_COMPAT)
|
||||
*/
|
||||
$output = htmlspecialchars($input);
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<title>Single Quoted Attribute</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<?php
|
||||
// the span tag will look like:
|
||||
// <span title='' onmouseover='alert(/ZF2!/);'>
|
||||
?>
|
||||
<span title='<?= $output ?>'>
|
||||
What framework are you using?
|
||||
</span>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
In the above example, the default `ENT_COMPAT` flag is being used, which does
|
||||
not escape single quotes, thus resulting in an alert box popping up when the
|
||||
`onmouseover` event happens on the `span` element.
|
||||
|
||||
Another example of incorrect HTML attribute escaping can happen when unquoted
|
||||
attributes are used (which is, by the way, perfectly valid HTML5):
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: text/html; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
faketitle onmouseover=alert(/ZF2!/);
|
||||
INPUT;
|
||||
|
||||
// Tough luck using proper flags when the title attribute is unquoted!
|
||||
$output = htmlspecialchars($input, ENT_QUOTES);
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<title>Quoteless Attribute</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<?php
|
||||
// the span tag will look like:
|
||||
// <span title=faketitle onmouseover=alert(/ZF2!/);>
|
||||
?>
|
||||
<span title=<?= $output ?>>
|
||||
What framework are you using?
|
||||
</span>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
The above example shows how it is easy to break out from unquoted attributes in
|
||||
HTML5.
|
||||
|
||||
## Example of Good HTML Attribute Escaping
|
||||
|
||||
Both of the previous examples can be avoided by simply using the
|
||||
`escapeHtmlAttr()` method:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: text/html; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
faketitle onmouseover=alert(/ZF2!/);
|
||||
INPUT;
|
||||
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
$output = $escaper->escapeHtmlAttr($input);
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<title>Quoteless Attribute</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<?php
|
||||
// the span tag will look like:
|
||||
// <span title=faketitle onmouseover=alert(/ZF2!/);>
|
||||
?>
|
||||
<span title=<?= $output ?>>
|
||||
What framework are you using?
|
||||
</span>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
In the above example, the malicious input from the attacker becomes completely
|
||||
harmless as we used proper HTML attribute escaping!
|
@@ -1,74 +0,0 @@
|
||||
# Escaping HTML
|
||||
|
||||
Probably the most common escaping happens for **HTML body** contexts. There are
|
||||
very few characters with special meaning in this context, yet it is quite common
|
||||
to escape data incorrectly, namely by setting the wrong flags and character
|
||||
encoding.
|
||||
|
||||
For escaping data to use within an HTML body context, use
|
||||
`Zend\Escaper\Escaper`'s `escapeHtml()` method. Internally it uses PHP's
|
||||
`htmlspecialchars()`, correctly setting the flags and encoding for you.
|
||||
|
||||
```php
|
||||
// Outputting this without escaping would be a bad idea!
|
||||
$input = '<script>alert("zf2")</script>';
|
||||
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
|
||||
// somewhere in an HTML template
|
||||
<div class="user-provided-input">
|
||||
<?= $escaper->escapeHtml($input) // all safe! ?>
|
||||
</div>
|
||||
```
|
||||
|
||||
One thing a developer needs to pay special attention to is the encoding in which
|
||||
the document is served to the client, as it **must be the same** as the encoding
|
||||
used for escaping!
|
||||
|
||||
## Example of Bad HTML Escaping
|
||||
|
||||
An example of incorrect usage:
|
||||
|
||||
```php
|
||||
<?php
|
||||
$input = '<script>alert("zf2")</script>';
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
?>
|
||||
<?php header('Content-Type: text/html; charset=ISO-8859-1'); ?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Encodings set incorrectly!</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
|
||||
</head>
|
||||
<body>
|
||||
<?php
|
||||
// Bad! The escaper's and the document's encodings are different!
|
||||
echo $escaper->escapeHtml($input);
|
||||
?>
|
||||
</body>
|
||||
```
|
||||
|
||||
## Example of Good HTML Escaping
|
||||
|
||||
An example of correct usage:
|
||||
|
||||
```php
|
||||
<?php
|
||||
$input = '<script>alert("zf2")</script>';
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
?>
|
||||
<?php header('Content-Type: text/html; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Encodings set correctly!</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
</head>
|
||||
<body>
|
||||
<?php
|
||||
// Good! The escaper's and the document's encodings are same!
|
||||
echo $escaper->escapeHtml($input);
|
||||
?>
|
||||
</body>
|
||||
```
|
@@ -1,93 +0,0 @@
|
||||
# Escaping Javascript
|
||||
|
||||
Javascript string literals in HTML are subject to significant restrictions due
|
||||
to the potential for unquoted attributes and uncertainty as to whether
|
||||
Javascript will be viewed as being `CDATA` or `PCDATA` by the browser. To
|
||||
eliminate any possible XSS vulnerabilities, Javascript escaping for HTML extends
|
||||
the escaping rules of both ECMAScript and JSON to include any potentially
|
||||
dangerous character. Very similar to HTML attribute value escaping, this means
|
||||
escaping everything except basic alphanumeric characters and the comma, period,
|
||||
and underscore characters as hexadecimal or unicode escapes.
|
||||
|
||||
Javascript escaping applies to all literal strings and digits. It is not
|
||||
possible to safely escape other Javascript markup.
|
||||
|
||||
To escape data in the **Javascript context**, use `Zend\Escaper\Escaper`'s
|
||||
`escapeJs()` method. An extended set of characters are escaped beyond
|
||||
ECMAScript's rules for Javascript literal string escaping in order to prevent
|
||||
misinterpretation of Javascript as HTML leading to the injection of special
|
||||
characters and entities.
|
||||
|
||||
## Example of Bad Javascript Escaping
|
||||
|
||||
An example of incorrect Javascript escaping:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
bar"; alert("Meow!"); var xss="true
|
||||
INPUT;
|
||||
|
||||
$output = json_encode($input);
|
||||
?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>Unescaped Entities</title>
|
||||
<meta charset="UTF-8"/>
|
||||
<script type="text/javascript">
|
||||
<?php
|
||||
// this will result in
|
||||
// var foo = "bar"; alert("Meow!"); var xss="true";
|
||||
?>
|
||||
var foo = <?= $output ?>;
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<p>json_encode() is not good for escaping javascript!</p>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
The above example will show an alert popup box as soon as the page is loaded,
|
||||
because the data is not properly escaped for the Javascript context.
|
||||
|
||||
## Example of Good Javascript Escaping
|
||||
|
||||
By using the `escapeJs()` method in the Javascript context, such attacks can be
|
||||
prevented:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: text/html; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
bar"; alert("Meow!"); var xss="true
|
||||
INPUT;
|
||||
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
$output = $escaper->escapeJs($input);
|
||||
?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>Escaped Entities</title>
|
||||
<meta charset="UTF-8"/>
|
||||
<script type="text/javascript">
|
||||
<?php
|
||||
// this will look like
|
||||
// var foo =
|
||||
bar\x26quot\x3B\x3B\x20alert\x28\x26quot\x3BMeow\x21\x26quot\x3B\x29\x3B\x20var\x20xss\x3D\x26quot\x3Btrue;
|
||||
?>
|
||||
var foo = <?= $output ?>;
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<p>Zend\Escaper\Escaper::escapeJs() is good for escaping javascript!</p>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
In the above example, the Javascript parser will most likely report a
|
||||
`SyntaxError`, but at least the targeted application remains safe from such
|
||||
attacks.
|
@@ -1,57 +0,0 @@
|
||||
# Escaping URLs
|
||||
|
||||
This method is basically an alias for PHP's `rawurlencode()` which has applied
|
||||
RFC 3986 since PHP 5.3. It is included primarily for consistency.
|
||||
|
||||
URL escaping applies to data being inserted into a URL and not to the whole URL
|
||||
itself.
|
||||
|
||||
## Example of Bad URL Escaping
|
||||
|
||||
XSS attacks are easy if data inserted into URLs is not escaped properly:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
" onmouseover="alert('zf2')
|
||||
INPUT;
|
||||
?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>Unescaped URL data</title>
|
||||
<meta charset="UTF-8"/>
|
||||
</head>
|
||||
<body>
|
||||
<a href="http://example.com/?name=<?= $input ?>">Click here!</a>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
## Example of Good URL Escaping
|
||||
|
||||
By properly escaping data in URLs by using `escapeUrl()`, we can prevent XSS
|
||||
attacks:
|
||||
|
||||
```php
|
||||
<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
$input = <<<INPUT
|
||||
" onmouseover="alert('zf2')
|
||||
INPUT;
|
||||
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
$output = $escaper->escapeUrl($input);
|
||||
?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>Unescaped URL data</title>
|
||||
<meta charset="UTF-8"/>
|
||||
</head>
|
||||
<body>
|
||||
<a href="http://example.com/?name=<?= $output ?>">Click here!</a>
|
||||
</body>
|
||||
</html>
|
||||
```
|
@@ -1,10 +0,0 @@
|
||||
<div class="container">
|
||||
<div class="jumbotron">
|
||||
<h1>zend-escaper</h1>
|
||||
|
||||
<p>Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs.</p>
|
||||
|
||||
<pre><code class="language-bash">$ composer require zendframework/zend-escaper</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
|
@@ -1 +0,0 @@
|
||||
../../README.md
|
@@ -1,51 +0,0 @@
|
||||
# Introduction
|
||||
|
||||
The [OWASP Top 10 web security risks](https://www.owasp.org/index.php/Top_10_2010-Main)
|
||||
study lists Cross-Site Scripting (XSS) in second place. PHP's sole functionality
|
||||
against XSS is limited to two functions of which one is commonly misapplied.
|
||||
Thus, the zend-escaper component was written. It offers developers a way to
|
||||
escape output and defend from XSS and related vulnerabilities by introducing
|
||||
**contextual escaping based on peer-reviewed rules**.
|
||||
|
||||
zend-escaper was written with ease of use in mind, so it can be used completely stand-alone from
|
||||
the rest of the framework, and as such can be installed with Composer:
|
||||
|
||||
```bash
|
||||
$ composer install zendframework/zend-escaper
|
||||
```
|
||||
|
||||
Several Zend Framework components provide integrations for consuming
|
||||
zend-escaper, including [zend-view](https://github.com/zendframework/zend-view),
|
||||
which provides a set of helpers that consume it.
|
||||
|
||||
> ### Security
|
||||
>
|
||||
> zend-escaper is a security related component. As such, if you believe you have
|
||||
> found an issue, we ask that you follow our [Security Policy](http://framework.zend.com/security/)
|
||||
> and report security issues accordingly. The Zend Framework team and the
|
||||
> contributors thank you in advance.
|
||||
|
||||
## Overview
|
||||
|
||||
zend-escaper provides one class, `Zend\Escaper\Escaper`, which in turn provides
|
||||
five methods for escaping output. Which method to use depends on the context in
|
||||
which the output is used. It is up to the developer to use the right methods in
|
||||
the right context.
|
||||
|
||||
`Zend\Escaper\Escaper` has the following escaping methods available for each context:
|
||||
|
||||
- `escapeHtml`: escape a string for an HTML body context.
|
||||
- `escapeHtmlAttr`: escape a string for an HTML attribute context.
|
||||
- `escapeJs`: escape a string for a Javascript context.
|
||||
- `escapeCss`: escape a string for a CSS context.
|
||||
- `escapeUrl`: escape a string for a URI or URI parameter context.
|
||||
|
||||
Usage of each method will be discussed in detail in later chapters.
|
||||
|
||||
## What zend-Escaper is not
|
||||
|
||||
zend-escaper is meant to be used only for *escaping data for output*, and as
|
||||
such should not be misused for *filtering input data*. For such tasks, use
|
||||
[zend-filter](https://zendframework.github.io/zend-filter/),
|
||||
[HTMLPurifier](http://htmlpurifier.org/) or PHP's
|
||||
[Filter](http://php.net/filter) functionality should be used.
|
@@ -1,147 +0,0 @@
|
||||
# Theory of Operation
|
||||
|
||||
zend-escaper provides methods for escaping output data, dependent on the context
|
||||
in which the data will be used. Each method is based on peer-reviewed rules and
|
||||
is in compliance with the current OWASP recommendations.
|
||||
|
||||
The escaping follows a well-known and fixed set of encoding rules defined by
|
||||
OWASP for each key HTML context. These rules cannot be impacted or negated by
|
||||
browser quirks or edge-case HTML parsing unless the browser suffers a
|
||||
catastrophic bug in its HTML parser or Javascript interpreter — both of
|
||||
these are unlikely.
|
||||
|
||||
The contexts in which zend-escaper should be used are **HTML Body**, **HTML
|
||||
Attribute**, **Javascript**, **CSS**, and **URL/URI** contexts.
|
||||
|
||||
Every escaper method will take the data to be escaped, make sure it is utf-8
|
||||
encoded data (or try to convert it to utf-8), perform context-based escaping,
|
||||
encode the escaped data back to its original encoding, and return the data to
|
||||
the caller.
|
||||
|
||||
The actual escaping of the data differs between each method; they all have their
|
||||
own set of rules according to which escaping is performed. An example will allow
|
||||
us to clearly demonstrate the difference, and how the same characters are being
|
||||
escaped differently between contexts:
|
||||
|
||||
```php
|
||||
$escaper = new Zend\Escaper\Escaper('utf-8');
|
||||
|
||||
// <script>alert("zf2")</script>
|
||||
echo $escaper->escapeHtml('<script>alert("zf2")</script>');
|
||||
|
||||
// <script>alert("zf2")</script>
|
||||
echo $escaper->escapeHtmlAttr('<script>alert("zf2")</script>');
|
||||
|
||||
// \x3Cscript\x3Ealert\x28\x22zf2\x22\x29\x3C\x2Fscript\x3E
|
||||
echo $escaper->escapeJs('<script>alert("zf2")</script>');
|
||||
|
||||
// \3C script\3E alert\28 \22 zf2\22 \29 \3C \2F script\3E
|
||||
echo $escaper->escapeCss('<script>alert("zf2")</script>');
|
||||
|
||||
// %3Cscript%3Ealert%28%22zf2%22%29%3C%2Fscript%3E
|
||||
echo $escaper->escapeUrl('<script>alert("zf2")</script>');
|
||||
```
|
||||
|
||||
More detailed examples will be given in later chapters.
|
||||
|
||||
## The Problem with Inconsistent Functionality
|
||||
|
||||
At present, programmers orient towards the following PHP functions for each
|
||||
common HTML context:
|
||||
|
||||
- **HTML Body**: `htmlspecialchars()` or `htmlentities()`
|
||||
- **HTML Attribute**: `htmlspecialchars()` or `htmlentities()`
|
||||
- **Javascript**: `addslashes()` or `json_encode()`
|
||||
- **CSS**: n/a
|
||||
- **URL/URI**: `rawurlencode()` or `urlencode()`
|
||||
|
||||
In practice, these decisions appear to depend more on what PHP offers, and if it
|
||||
can be interpreted as offering sufficient escaping safety, than it does on what
|
||||
is recommended in reality to defend against XSS. While these functions can
|
||||
prevent some forms of XSS, they do not cover all use cases or risks and are
|
||||
therefore insufficient defenses.
|
||||
|
||||
Using `htmlspecialchars()` in a perfectly valid HTML5 unquoted attribute value,
|
||||
for example, is completely useless since the value can be terminated by a space
|
||||
(among other things), which is never escaped. Thus, in this instance, we have a
|
||||
conflict between a widely used HTML escaper and a modern HTML specification,
|
||||
with no specific function available to cover this use case. While it's tempting
|
||||
to blame users, or the HTML specification authors, escaping just needs to deal
|
||||
with whatever HTML and browsers allow.
|
||||
|
||||
Using `addslashes()`, custom backslash escaping, or `json_encode()` will
|
||||
typically ignore HTML special characters such as ampersands, which may be used
|
||||
to inject entities into Javascript. Under the right circumstances, the browser
|
||||
will convert these entities into their literal equivalents before interpreting
|
||||
Javascript, thus allowing attackers to inject arbitrary code.
|
||||
|
||||
Inconsistencies with valid HTML, insecure default parameters, lack of character
|
||||
encoding awareness, and misrepresentations of what functions are capable of by
|
||||
some programmers — these all make escaping in PHP an unnecessarily
|
||||
convoluted quest.
|
||||
|
||||
To circumvent the lack of escaping methods in PHP, zend-escaper addresses the
|
||||
need to apply context-specific escaping in web applications. It implements
|
||||
methods that specifically target XSS and offers programmers a tool to secure
|
||||
their applications without misusing other inadequate methods, or using, most
|
||||
likely incomplete, home-grown solutions.
|
||||
|
||||
## Why Contextual Escaping?
|
||||
|
||||
To understand why multiple standardised escaping methods are needed, what
|
||||
follows are several quick points; they are by no means a complete set of
|
||||
reasons, however!
|
||||
|
||||
### HTML escaping of unquoted HTML attribute values still allows XSS
|
||||
|
||||
This is probably the best known way to defeat `htmlspecialchars()` when used on
|
||||
attribute values, since any space (or character interpreted as a space —
|
||||
there are a lot) lets you inject new attributes whose content can't be
|
||||
neutralised by HTML escaping. The solution (where this is possible) is
|
||||
additional escaping as defined by the OWASP ESAPI codecs. The point here can be
|
||||
extended further — escaping only works if a programmer or designer knows
|
||||
what they're doing. In many contexts, there are additional practices and gotchas
|
||||
that need to be carefully monitored since escaping sometimes needs a little
|
||||
extra help to protect against XSS — even if that means ensuring all
|
||||
attribute values are properly double quoted despite this not being required for
|
||||
valid HTML.
|
||||
|
||||
### HTML escaping of CSS, Javascript or URIs is often reversed when passed to non-HTML interpreters by the browser
|
||||
|
||||
HTML escaping is just that &mdsash; it's designed to escape a string for HTML
|
||||
(i.e. prevent tag or attribute insertion), but not alter the underlying meaning
|
||||
of the content, whether it be text, Javascript, CSS, or URIs. For that purpose,
|
||||
a fully HTML-escaped version of any other context may still have its unescaped
|
||||
form extracted before it's interpreted or executed. For this reason we need
|
||||
separate escapers for Javascript, CSS, and URIs, and developers or designers
|
||||
writing templates **must** know which escaper to apply to which context. Of
|
||||
course, this means you need to be able to identify the correct context before
|
||||
selecting the right escaper!
|
||||
|
||||
### DOM-based XSS requires a defence using at least two levels of different escaping in many cases
|
||||
|
||||
DOM-based XSS has become increasingly common as Javascript has taken off in
|
||||
popularity for large scale client-side coding. A simple example is Javascript
|
||||
defined in a template which inserts a new piece of HTML text into the DOM. If
|
||||
the string is only HTML escaped, it may still contain Javascript that will
|
||||
execute in that context. If the string is only Javascript-escaped, it may
|
||||
contain HTML markup (new tags and attributes) which will be injected into the
|
||||
DOM and parsed once the inserting Javascript executes. Damned either way? The
|
||||
solution is to escape twice — first escape the string for HTML (make it
|
||||
safe for DOM insertion), and then for Javascript (make it safe for the current
|
||||
Javascript context). Nested contexts are a common means of bypassing naive
|
||||
escaping habits (e.g. you can inject Javascript into a CSS expression within an
|
||||
HTML attribute).
|
||||
|
||||
### PHP has no known anti-XSS escape functions (only those kidnapped from their original purposes)
|
||||
|
||||
A simple example, widely used, is when you see `json_encode()` used to escape
|
||||
Javascript, or worse, some kind of mutant `addslashes()` implementation. These
|
||||
were never designed to eliminate XSS, yet PHP programmers use them as such. For
|
||||
example, `json_encode()` does not escape the ampersand or semi-colon characters
|
||||
by default. That means you can easily inject HTML entities which could then be
|
||||
decoded before the Javascript is evaluated in a HTML document. This lets you
|
||||
break out of strings, add new JS statements, close tags, etc. In other words,
|
||||
using `json_encode()` is insufficient and naive. The same, arguably, could be
|
||||
said for `htmlspecialchars()` which has its own well known limitations that make
|
||||
a singular reliance on it a questionable practice.
|
17
vendor/zendframework/zend-escaper/mkdocs.yml
vendored
17
vendor/zendframework/zend-escaper/mkdocs.yml
vendored
@@ -1,17 +0,0 @@
|
||||
docs_dir: doc/book
|
||||
site_dir: doc/html
|
||||
pages:
|
||||
- index.md
|
||||
- Intro: intro.md
|
||||
- Reference:
|
||||
- "Theory of Operation": theory-of-operation.md
|
||||
- Configuration: configuration.md
|
||||
- "Escaping HTML": escaping-html.md
|
||||
- "Escaping HTML Attributes": escaping-html-attributes.md
|
||||
- "Escaping Javascript": escaping-javascript.md
|
||||
- "Escaping CSS": escaping-css.md
|
||||
- "Escaping URLs": escaping-url.md
|
||||
site_name: zend-escaper
|
||||
site_description: zend-escaper
|
||||
repo_url: 'https://github.com/zendframework/zend-escaper'
|
||||
copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'
|
@@ -95,7 +95,11 @@ class Escaper
|
||||
public function __construct($encoding = null)
|
||||
{
|
||||
if ($encoding !== null) {
|
||||
$encoding = (string) $encoding;
|
||||
if (! is_string($encoding)) {
|
||||
throw new Exception\InvalidArgumentException(
|
||||
get_class($this) . ' constructor parameter must be a string, received ' . gettype($encoding)
|
||||
);
|
||||
}
|
||||
if ($encoding === '') {
|
||||
throw new Exception\InvalidArgumentException(
|
||||
get_class($this) . ' constructor parameter does not allow a blank value'
|
||||
@@ -103,7 +107,7 @@ class Escaper
|
||||
}
|
||||
|
||||
$encoding = strtolower($encoding);
|
||||
if (!in_array($encoding, $this->supportedEncodings)) {
|
||||
if (! in_array($encoding, $this->supportedEncodings)) {
|
||||
throw new Exception\InvalidArgumentException(
|
||||
'Value of \'' . $encoding . '\' passed to ' . get_class($this)
|
||||
. ' constructor parameter is invalid. Provide an encoding supported by htmlspecialchars()'
|
||||
@@ -321,7 +325,7 @@ class Escaper
|
||||
$result = $this->convertEncoding($string, 'UTF-8', $this->getEncoding());
|
||||
}
|
||||
|
||||
if (!$this->isUtf8($result)) {
|
||||
if (! $this->isUtf8($result)) {
|
||||
throw new Exception\RuntimeException(
|
||||
sprintf('String to be escaped was not valid UTF-8 or could not be converted: %s', $result)
|
||||
);
|
||||
|
Reference in New Issue
Block a user