Skip to content

Commit

Permalink
Merge pull request #6 from maxhelias/v2
Browse files Browse the repository at this point in the history 
Migration PHP 5.x to PHP 7.x
  • Loading branch information
@maxhelias
maxhelias authored Mar 26, 2018
2 parents 018b6b4 + 8590505 commit d5a705d
Show file tree
Hide file tree
Showing 81 changed files with 729 additions and 1,712 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ root = true
charset = utf-8

# Unix-style newlines with a newline ending every file
[*]
[!*.{otf,ttf,woff,png}]
end_of_line = lf
insert_final_newline = true

Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
/tests export-ignore

# End line
* text eol=lf
\!*.{otf,ttf,woff,png} text eol=lf
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ env:
- COMPOSER_DISABLE_XDEBUG_WARN=1

php:
- 5.6
- 7.0
- 7.1
- 7.2
Expand Down
14 changes: 7 additions & 7 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
}
],
"require": {
"php": ">=5.5.0",
"guzzlehttp/guzzle": "^6.0"
"php": ">=7.0",
"guzzlehttp/guzzle": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "5.7.*",
"squizlabs/php_codesniffer": "@dev",
"squizlabs/php_codesniffer": "dev-master",
"phpro/grumphp": "^0.12.0||0.9.*"
},
"autoload": {
Expand All @@ -31,9 +31,9 @@
}
},
"scripts": {
"test": "vendor\\bin\\phpunit",
"check-style": "vendor\\bin\\phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
"fix-style": "vendor\\bin\\phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
"doc": "phpdoc -d src\\ -t docs\\"
"test": "vendor/bin/phpunit",
"check-style": "vendor/bin/phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
"fix-style": "vendor/bin/phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
"doc": "phpdoc -d src/ -t docs/"
}
}
22 changes: 11 additions & 11 deletions docs/classes/maxh.Nominatim.Exceptions.InvalidParameterException.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,37 +144,37 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2031783678"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1597574722"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-2031783678" class="accordion-body collapse in">
<div id="namespace-1597574722" class="accordion-body collapse in">
<div class="accordion-inner">

<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-462031428"></a>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2072921793"></a>
<a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
</div>
<div id="namespace-462031428" class="accordion-body collapse ">
<div id="namespace-2072921793" class="accordion-body collapse ">
<div class="accordion-inner">

<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-582360848"></a>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2025259895"></a>
<a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
</div>
<div id="namespace-582360848" class="accordion-body collapse ">
<div id="namespace-2025259895" class="accordion-body collapse ">
<div class="accordion-inner">

<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-989794078"></a>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-68463740"></a>
<a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
</div>
<div id="namespace-989794078" class="accordion-body collapse ">
<div id="namespace-68463740" class="accordion-body collapse ">
<div class="accordion-inner">


Expand Down Expand Up @@ -287,7 +287,7 @@ <h2>Summary</h2>

<dl>
<dt>File</dt>
<dd><a href="../files/Exceptions.InvalidParameterException.html"><div class="path-wrapper">Exceptions\InvalidParameterException.php</div></a></dd>
<dd><a href="../files/Exceptions.InvalidParameterException.html"><div class="path-wrapper">Exceptions/InvalidParameterException.php</div></a></dd>
<dt>Package</dt>
<dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
<dt>Class hierarchy</dt>
Expand Down Expand Up @@ -327,7 +327,7 @@ <h2>Tags</h2>
<h3 id="source-view-label">InvalidParameterException.php</h3>
</div>
<div class="modal-body">
<pre data-src="../files/Exceptions\InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
<pre data-src="../files/Exceptions/InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
</div>
</div>

Expand Down Expand Up @@ -368,7 +368,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on January 14th, 2018 at 23:46.
on March 26th, 2018 at 20:58.
</section>
</section>
</section>
Expand Down
33 changes: 16 additions & 17 deletions docs/classes/maxh.Nominatim.Exceptions.NominatimException.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,37 +144,37 @@
<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-743962778"></a>
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1173300529"></a>
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
</div>
<div id="namespace-743962778" class="accordion-body collapse in">
<div id="namespace-1173300529" class="accordion-body collapse in">
<div class="accordion-inner">

<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1969366245"></a>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-969570493"></a>
<a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
</div>
<div id="namespace-1969366245" class="accordion-body collapse ">
<div id="namespace-969570493" class="accordion-body collapse ">
<div class="accordion-inner">

<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1287626162"></a>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1779959186"></a>
<a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
</div>
<div id="namespace-1287626162" class="accordion-body collapse ">
<div id="namespace-1779959186" class="accordion-body collapse ">
<div class="accordion-inner">

<div class="accordion" style="margin-bottom: 0">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-387998253"></a>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-253047147"></a>
<a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
</div>
<div id="namespace-387998253" class="accordion-body collapse ">
<div id="namespace-253047147" class="accordion-body collapse ">
<div class="accordion-inner">


Expand Down Expand Up @@ -290,7 +290,7 @@ <h2>Summary</h2>

<dl>
<dt>File</dt>
<dd><a href="../files/Exceptions.NominatimException.html"><div class="path-wrapper">Exceptions\NominatimException.php</div></a></dd>
<dd><a href="../files/Exceptions.NominatimException.html"><div class="path-wrapper">Exceptions/NominatimException.php</div></a></dd>
<dt>Package</dt>
<dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
<dt>Class hierarchy</dt>
Expand Down Expand Up @@ -389,7 +389,7 @@ <h2>Tags</h2>
<article class="method">
<h3 class="public ">__construct()</h3>
<a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
<pre class="signature" style="margin-right: 54px;">__construct(string <span class="argument">$message</span>, \Psr\Http\Message\RequestInterface <span class="argument">$request</span>, \Psr\Http\Message\ResponseInterface|null <span class="argument">$response = null</span>, \Exception|null <span class="argument">$previous = null</span>) </pre>
<pre class="signature" style="margin-right: 54px;">__construct(string <span class="argument">$message</span>, \Psr\Http\Message\RequestInterface <span class="argument">$request = null</span>, \Psr\Http\Message\ResponseInterface|null <span class="argument">$response = null</span>, \Exception|null <span class="argument">$previous = null</span>) </pre>
<p><em>Constructor</em></p>


Expand Down Expand Up @@ -438,14 +438,14 @@ <h2>Tags</h2>
<article class="method">
<h3 class="public ">getRequest()</h3>
<a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
<pre class="signature" style="margin-right: 54px;">getRequest() : \GuzzleHttp\Psr7\Request</pre>
<pre class="signature" style="margin-right: 54px;">getRequest() : \Psr\Http\Message\RequestInterface</pre>
<p><em>Return the Request</em></p>




<h4>Returns</h4>
\GuzzleHttp\Psr7\Request
\Psr\Http\Message\RequestInterface

</article>
</div>
Expand All @@ -466,15 +466,14 @@ <h2>Tags</h2>
<article class="method">
<h3 class="public ">getResponse()</h3>
<a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
<pre class="signature" style="margin-right: 54px;">getResponse() : \GuzzleHttp\Psr7\Response</pre>
<pre class="signature" style="margin-right: 54px;">getResponse() : \GuzzleHttp\Promise\PromiseInterface|\Psr\Http\Message\ResponseInterface</pre>
<p><em>Return the Response</em></p>




<h4>Returns</h4>
\GuzzleHttp\Psr7\Response
&mdash; <p>[description]</p>
\GuzzleHttp\Promise\PromiseInterface|\Psr\Http\Message\ResponseInterface

</article>
</div>
Expand All @@ -498,7 +497,7 @@ <h2>Tags</h2>
<h3 id="source-view-label">NominatimException.php</h3>
</div>
<div class="modal-body">
<pre data-src="../files/Exceptions\NominatimException.php.txt" class="language-php line-numbers"></pre>
<pre data-src="../files/Exceptions/NominatimException.php.txt" class="language-php line-numbers"></pre>
</div>
</div>

Expand Down Expand Up @@ -539,7 +538,7 @@ <h1><i class="icon-pushpin"></i></h1>
<section class="span10 offset1">
<hr />
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
on January 14th, 2018 at 23:46.
on March 26th, 2018 at 20:58.
</section>
</section>
</section>
Expand Down
Loading

0 comments on commit d5a705d

Please sign in to comment.