Skip to content

Commit c4f17b3

Browse files
authored
Merge branch 'master' into patch-2
2 parents 4906748 + ce410fe commit c4f17b3

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

.travis.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
language: php
22

3-
php:
4-
- 5.3
5-
- 5.4
6-
- 5.5
7-
- 5.6
3+
env:
4+
global:
5+
- DEPENDENCIES=no
86

97
matrix:
10-
allow_failures:
8+
include:
9+
- php: 5.3
10+
dist: precise
11+
- php: 5.4
12+
dist: precise
1113
- php: 5.6
14+
- php: 7.0
15+
- php: 7.1
16+
- php: nightly
17+
allow_failures:
18+
- php: 7.2
19+
- php: nightly
1220

1321
script:
1422
- mkdir -p build/logs

lib/PHPExif/Adapter/Native.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace PHPExif\Adapter;
1313

1414
use PHPExif\Exif;
15-
use DateTime;
1615

1716
/**
1817
* PHP Exif Native Reader Adapter
@@ -96,7 +95,7 @@ public function getRequiredSections()
9695
* Setter for the EXIF sections
9796
*
9897
* @param array $sections List of EXIF sections
99-
* @return \PHPExif\Reader Current instance for chaining
98+
* @return \PHPExif\Adapter\Native Current instance for chaining
10099
*/
101100
public function setRequiredSections(array $sections)
102101
{
@@ -109,7 +108,7 @@ public function setRequiredSections(array $sections)
109108
* Adds an EXIF section to the list
110109
*
111110
* @param string $section
112-
* @return \PHPExif\Reader Current instance for chaining
111+
* @return \PHPExif\Adapter\Native Current instance for chaining
113112
*/
114113
public function addRequiredSection($section)
115114
{
@@ -124,7 +123,7 @@ public function addRequiredSection($section)
124123
* Define if the thumbnail should be included into the EXIF data or not
125124
*
126125
* @param boolean $value
127-
* @return \PHPExif\Reader Current instance for chaining
126+
* @return \PHPExif\Adapter\Native Current instance for chaining
128127
*/
129128
public function setIncludeThumbnail($value)
130129
{
@@ -147,7 +146,7 @@ public function getIncludeThumbnail()
147146
* Define if the sections should be parsed as arrays
148147
*
149148
* @param boolean $value
150-
* @return \PHPExif\Reader Current instance for chaining
149+
* @return \PHPExif\Adapter\Native Current instance for chaining
151150
*/
152151
public function setSectionsAsArrays($value)
153152
{

0 commit comments

Comments
 (0)