Skip to content

Commit e6e760c

Browse files
author
Robert Pustułka
committed
Deprecate callback option.
1 parent 46253c5 commit e6e760c

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/Excel/Manager.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,10 @@ public function getReader(File $file, array $options = [])
320320
}
321321
}
322322
if (isset($options['callback'])) {
323-
$result = $options['callback']($reader, $file);
323+
trigger_error('Option `callback` has been deprecated. Use `readerCallback` instead', E_USER_DEPRECATED);
324+
}
325+
if (isset($options['readerCallback'])) {
326+
$result = $options['readerCallback']($reader, $file);
324327
if ($result instanceof PHPExcel_Reader_IReader) {
325328
$reader = $result;
326329
}
@@ -357,7 +360,10 @@ public function getWriter(PHPExcel $excel, File $file, array $options = [])
357360
}
358361
}
359362
if (isset($options['callback'])) {
360-
$result = $options['callback']($writer, $file);
363+
trigger_error('Option `callback` has been deprecated. Use `writerCallback` instead', E_USER_DEPRECATED);
364+
}
365+
if (isset($options['writerCallback'])) {
366+
$result = $options['writerCallback']($writer, $file);
361367
if ($result instanceof PHPExcel_Writer_IWriter) {
362368
$writer = $result;
363369
}

tests/TestCase/Excel/ManagerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function testGetReaderCallback()
111111
$file = $this->getFile('test.csv');
112112

113113
$reader = $manager->getReader($file, [
114-
'callback' => function ($reader) {
114+
'readerCallback' => function ($reader) {
115115
$reader->setEnclosure('FOO');
116116

117117
return $reader;
@@ -163,7 +163,7 @@ public function testGetWriterCallback()
163163
$file = $this->getFile('test.csv');
164164

165165
$writer = $manager->getWriter($excel, $file, [
166-
'callback' => function ($reader) {
166+
'writerCallback' => function ($reader) {
167167
$reader->setEnclosure('FOO');
168168
}
169169
]);
@@ -769,7 +769,7 @@ public function testSaveAndCallbackWriter()
769769
$manager = new Manager();
770770

771771
$manager->save($excel, $file, [
772-
'callback' => function () use ($writer) {
772+
'writerCallback' => function () use ($writer) {
773773
return $writer;
774774
}
775775
]);

0 commit comments

Comments
 (0)