Skip to content

Commit 72e1bf1

Browse files
committed
#reader-interface remove default value for adapter
1 parent b7c6166 commit 72e1bf1

File tree

3 files changed

+4
-25
lines changed

3 files changed

+4
-25
lines changed

lib/PHPExif/Reader/ImmutableException.php

-10
This file was deleted.

lib/PHPExif/Reader/Reader.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ class Reader implements ReaderInterface
4242
*
4343
* @param \PHPExif\Adapter\AdapterInterface $adapter
4444
*/
45-
public function __construct(AdapterInterface $adapter = null)
45+
public function __construct(AdapterInterface $adapter)
4646
{
47-
if (!is_null($adapter)) {
48-
$this->adapter = $adapter;
49-
}
47+
$this->adapter = $adapter;
5048
}
5149

5250
/**

tests/PHPExif/ReaderTest.php

+2-11
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
1111
*/
1212
public function setUp()
1313
{
14-
$this->reader = new \PHPExif\Reader\Reader();
14+
$adapter = $this->getMock('\PHPExif\Adapter\AdapterInterface');
15+
$this->reader = new \PHPExif\Reader\Reader($adapter);
1516
}
1617

1718
/**
@@ -44,16 +45,6 @@ public function testGetAdapterFromProperty()
4445
$this->assertSame($mock, $this->reader->getAdapter());
4546
}
4647

47-
/**
48-
* @group reader
49-
* @covers \PHPExif\Reader\Reader::getAdapter
50-
* @expectedException \PHPExif\Adapter\NoAdapterException
51-
*/
52-
public function testGetAdapterThrowsException()
53-
{
54-
$this->reader->getAdapter();
55-
}
56-
5748
/**
5849
* @group reader
5950
* @covers \PHPExif\Reader\Reader::read

0 commit comments

Comments
 (0)