Skip to content

Commit d5a705d

Browse files
maxheliasmaxhelias
authored
Merge pull request #6 from maxhelias/v2
Migration PHP 5.x to PHP 7.x
2 parents 018b6b4 + 8590505 commit d5a705d

File tree

81 files changed

+729
-1712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+729
-1712
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ root = true
77
charset = utf-8
88

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

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
/tests export-ignore
1515

1616
# End line
17-
* text eol=lf
17+
\!*.{otf,ttf,woff,png} text eol=lf

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ env:
1212
- COMPOSER_DISABLE_XDEBUG_WARN=1
1313

1414
php:
15-
- 5.6
1615
- 7.0
1716
- 7.1
1817
- 7.2

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
}
1515
],
1616
"require": {
17-
"php": ">=5.5.0",
18-
"guzzlehttp/guzzle": "^6.0"
17+
"php": ">=7.0",
18+
"guzzlehttp/guzzle": "dev-master"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "5.7.*",
22-
"squizlabs/php_codesniffer": "@dev",
22+
"squizlabs/php_codesniffer": "dev-master",
2323
"phpro/grumphp": "^0.12.0||0.9.*"
2424
},
2525
"autoload": {
@@ -31,9 +31,9 @@
3131
}
3232
},
3333
"scripts": {
34-
"test": "vendor\\bin\\phpunit",
35-
"check-style": "vendor\\bin\\phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
36-
"fix-style": "vendor\\bin\\phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
37-
"doc": "phpdoc -d src\\ -t docs\\"
34+
"test": "vendor/bin/phpunit",
35+
"check-style": "vendor/bin/phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
36+
"fix-style": "vendor/bin/phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
37+
"doc": "phpdoc -d src/ -t docs/"
3838
}
3939
}

‎docs/classes/maxh.Nominatim.Exceptions.InvalidParameterException.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,37 +144,37 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2031783678"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1597574722"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-2031783678" class="accordion-body collapse in">
150+
<div id="namespace-1597574722" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-462031428"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2072921793"></a>
157157
<a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
158158
</div>
159-
<div id="namespace-462031428" class="accordion-body collapse ">
159+
<div id="namespace-2072921793" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

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

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

180180

@@ -287,7 +287,7 @@ <h2>Summary</h2>
287287

288288
<dl>
289289
<dt>File</dt>
290-
<dd><a href="../files/Exceptions.InvalidParameterException.html"><div class="path-wrapper">Exceptions\InvalidParameterException.php</div></a></dd>
290+
<dd><a href="../files/Exceptions.InvalidParameterException.html"><div class="path-wrapper">Exceptions/InvalidParameterException.php</div></a></dd>
291291
<dt>Package</dt>
292292
<dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
293293
<dt>Class hierarchy</dt>
@@ -327,7 +327,7 @@ <h2>Tags</h2>
327327
<h3 id="source-view-label">InvalidParameterException.php</h3>
328328
</div>
329329
<div class="modal-body">
330-
<pre data-src="../files/Exceptions\InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
330+
<pre data-src="../files/Exceptions/InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
331331
</div>
332332
</div>
333333

@@ -368,7 +368,7 @@ <h1><i class="icon-pushpin"></i></h1>
368368
<section class="span10 offset1">
369369
<hr />
370370
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
371-
on January 14th, 2018 at 23:46.
371+
on March 26th, 2018 at 20:58.
372372
</section>
373373
</section>
374374
</section>

‎docs/classes/maxh.Nominatim.Exceptions.NominatimException.html‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -144,37 +144,37 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-743962778"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1173300529"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-743962778" class="accordion-body collapse in">
150+
<div id="namespace-1173300529" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1969366245"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-969570493"></a>
157157
<a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
158158
</div>
159-
<div id="namespace-1969366245" class="accordion-body collapse ">
159+
<div id="namespace-969570493" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

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

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

180180

@@ -290,7 +290,7 @@ <h2>Summary</h2>
290290

291291
<dl>
292292
<dt>File</dt>
293-
<dd><a href="../files/Exceptions.NominatimException.html"><div class="path-wrapper">Exceptions\NominatimException.php</div></a></dd>
293+
<dd><a href="../files/Exceptions.NominatimException.html"><div class="path-wrapper">Exceptions/NominatimException.php</div></a></dd>
294294
<dt>Package</dt>
295295
<dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
296296
<dt>Class hierarchy</dt>
@@ -389,7 +389,7 @@ <h2>Tags</h2>
389389
<article class="method">
390390
<h3 class="public ">__construct()</h3>
391391
<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>
392-
<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>
392+
<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>
393393
<p><em>Constructor</em></p>
394394

395395

@@ -438,14 +438,14 @@ <h2>Tags</h2>
438438
<article class="method">
439439
<h3 class="public ">getRequest()</h3>
440440
<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>
441-
<pre class="signature" style="margin-right: 54px;">getRequest() : \GuzzleHttp\Psr7\Request</pre>
441+
<pre class="signature" style="margin-right: 54px;">getRequest() : \Psr\Http\Message\RequestInterface</pre>
442442
<p><em>Return the Request</em></p>
443443

444444

445445

446446

447447
<h4>Returns</h4>
448-
\GuzzleHttp\Psr7\Request
448+
\Psr\Http\Message\RequestInterface
449449

450450
</article>
451451
</div>
@@ -466,15 +466,14 @@ <h2>Tags</h2>
466466
<article class="method">
467467
<h3 class="public ">getResponse()</h3>
468468
<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>
469-
<pre class="signature" style="margin-right: 54px;">getResponse() : \GuzzleHttp\Psr7\Response</pre>
469+
<pre class="signature" style="margin-right: 54px;">getResponse() : \GuzzleHttp\Promise\PromiseInterface|\Psr\Http\Message\ResponseInterface</pre>
470470
<p><em>Return the Response</em></p>
471471

472472

473473

474474

475475
<h4>Returns</h4>
476-
\GuzzleHttp\Psr7\Response
477-
&mdash; <p>[description]</p>
476+
\GuzzleHttp\Promise\PromiseInterface|\Psr\Http\Message\ResponseInterface
478477

479478
</article>
480479
</div>
@@ -498,7 +497,7 @@ <h2>Tags</h2>
498497
<h3 id="source-view-label">NominatimException.php</h3>
499498
</div>
500499
<div class="modal-body">
501-
<pre data-src="../files/Exceptions\NominatimException.php.txt" class="language-php line-numbers"></pre>
500+
<pre data-src="../files/Exceptions/NominatimException.php.txt" class="language-php line-numbers"></pre>
502501
</div>
503502
</div>
504503

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

0 commit comments

Comments
 (0)