Skip to content
This repository has been archived by the owner on May 19, 2024. It is now read-only.

Commit

Permalink
Removed PHP 5.3 workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
@MewesK
MewesK committed Feb 14, 2016
1 parent 6cd78ae commit 62863b3
Show file tree
Hide file tree
Showing 5 changed files with 218 additions and 228 deletions.
70 changes: 34 additions & 36 deletions Wrapper/XlsCellWrapper.php
View file
Expand Up @@ -49,58 +49,56 @@ public function __construct(array $context, XlsSheetWrapper $sheetWrapper)

protected function initializeMappings()
{
$wrapper = $this; // PHP 5.3 fix

$this->mappings['break'] = function ($value) use ($wrapper) {
$wrapper->sheetWrapper->getObject()->setBreak($wrapper->object->getCoordinate(), $value);
$this->mappings['break'] = function ($value) {
$this->sheetWrapper->getObject()->setBreak($this->object->getCoordinate(), $value);
};
$this->mappings['dataType'] = function ($value) use ($wrapper) {
$wrapper->object->setDataType($value);
$this->mappings['dataType'] = function ($value) {
$this->object->setDataType($value);
};
$this->mappings['dataValidation']['allowBlank'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setAllowBlank($value);
$this->mappings['dataValidation']['allowBlank'] = function ($value) {
$this->object->getDataValidation()->setAllowBlank($value);
};
$this->mappings['dataValidation']['error'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setError($value);
$this->mappings['dataValidation']['error'] = function ($value) {
$this->object->getDataValidation()->setError($value);
};
$this->mappings['dataValidation']['errorStyle'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setErrorStyle($value);
$this->mappings['dataValidation']['errorStyle'] = function ($value) {
$this->object->getDataValidation()->setErrorStyle($value);
};
$this->mappings['dataValidation']['errorTitle'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setErrorTitle($value);
$this->mappings['dataValidation']['errorTitle'] = function ($value) {
$this->object->getDataValidation()->setErrorTitle($value);
};
$this->mappings['dataValidation']['formula1'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setFormula1($value);
$this->mappings['dataValidation']['formula1'] = function ($value) {
$this->object->getDataValidation()->setFormula1($value);
};
$this->mappings['dataValidation']['formula2'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setFormula2($value);
$this->mappings['dataValidation']['formula2'] = function ($value) {
$this->object->getDataValidation()->setFormula2($value);
};
$this->mappings['dataValidation']['operator'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setOperator($value);
$this->mappings['dataValidation']['operator'] = function ($value) {
$this->object->getDataValidation()->setOperator($value);
};
$this->mappings['dataValidation']['prompt'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setPrompt($value);
$this->mappings['dataValidation']['prompt'] = function ($value) {
$this->object->getDataValidation()->setPrompt($value);
};
$this->mappings['dataValidation']['promptTitle'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setPromptTitle($value);
$this->mappings['dataValidation']['promptTitle'] = function ($value) {
$this->object->getDataValidation()->setPromptTitle($value);
};
$this->mappings['dataValidation']['showDropDown'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setShowDropDown($value);
$this->mappings['dataValidation']['showDropDown'] = function ($value) {
$this->object->getDataValidation()->setShowDropDown($value);
};
$this->mappings['dataValidation']['showErrorMessage'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setShowErrorMessage($value);
$this->mappings['dataValidation']['showErrorMessage'] = function ($value) {
$this->object->getDataValidation()->setShowErrorMessage($value);
};
$this->mappings['dataValidation']['showInputMessage'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setShowInputMessage($value);
$this->mappings['dataValidation']['showInputMessage'] = function ($value) {
$this->object->getDataValidation()->setShowInputMessage($value);
};
$this->mappings['dataValidation']['type'] = function ($value) use ($wrapper) {
$wrapper->object->getDataValidation()->setType($value);
$this->mappings['dataValidation']['type'] = function ($value) {
$this->object->getDataValidation()->setType($value);
};
$this->mappings['style'] = function ($value) use ($wrapper) {
$wrapper->sheetWrapper->getObject()->getStyle($wrapper->object->getCoordinate())->applyFromArray($value);
$this->mappings['style'] = function ($value) {
$this->sheetWrapper->getObject()->getStyle($this->object->getCoordinate())->applyFromArray($value);
};
$this->mappings['url'] = function ($value) use ($wrapper) {
$wrapper->object->getHyperlink()->setUrl($value);
$this->mappings['url'] = function ($value) {
$this->object->getHyperlink()->setUrl($value);
};
}

Expand Down
74 changes: 36 additions & 38 deletions Wrapper/XlsDocumentWrapper.php
View file
Expand Up @@ -48,61 +48,59 @@ public function __construct(array $context)

protected function initializeMappings()
{
$wrapper = $this; // PHP 5.3 fix

$this->mappings['category'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setCategory($value);
$this->mappings['category'] = function ($value) {
$this->object->getProperties()->setCategory($value);
};
$this->mappings['company'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setCompany($value);
$this->mappings['company'] = function ($value) {
$this->object->getProperties()->setCompany($value);
};
$this->mappings['created'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setCreated($value);
$this->mappings['created'] = function ($value) {
$this->object->getProperties()->setCreated($value);
};
$this->mappings['creator'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setCreator($value);
$this->mappings['creator'] = function ($value) {
$this->object->getProperties()->setCreator($value);
};
$this->mappings['defaultStyle'] = function ($value) use ($wrapper) {
$wrapper->object->getDefaultStyle()->applyFromArray($value);
$this->mappings['defaultStyle'] = function ($value) {
$this->object->getDefaultStyle()->applyFromArray($value);
};
$this->mappings['description'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setDescription($value);
$this->mappings['description'] = function ($value) {
$this->object->getProperties()->setDescription($value);
};
$this->mappings['format'] = function ($value) use ($wrapper) {
$wrapper->attributes['format'] = $value;
$this->mappings['format'] = function ($value) {
$this->attributes['format'] = $value;
};
$this->mappings['keywords'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setKeywords($value);
$this->mappings['keywords'] = function ($value) {
$this->object->getProperties()->setKeywords($value);
};
$this->mappings['lastModifiedBy'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setLastModifiedBy($value);
$this->mappings['lastModifiedBy'] = function ($value) {
$this->object->getProperties()->setLastModifiedBy($value);
};
$this->mappings['manager'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setManager($value);
$this->mappings['manager'] = function ($value) {
$this->object->getProperties()->setManager($value);
};
$this->mappings['modified'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setModified($value);
$this->mappings['modified'] = function ($value) {
$this->object->getProperties()->setModified($value);
};
$this->mappings['security']['lockRevision'] = function ($value) use ($wrapper) {
$wrapper->object->getSecurity()->setLockRevision($value);
$this->mappings['security']['lockRevision'] = function ($value) {
$this->object->getSecurity()->setLockRevision($value);
};
$this->mappings['security']['lockStructure'] = function ($value) use ($wrapper) {
$wrapper->object->getSecurity()->setLockStructure($value);
$this->mappings['security']['lockStructure'] = function ($value) {
$this->object->getSecurity()->setLockStructure($value);
};
$this->mappings['security']['lockWindows'] = function ($value) use ($wrapper) {
$wrapper->object->getSecurity()->setLockWindows($value);
$this->mappings['security']['lockWindows'] = function ($value) {
$this->object->getSecurity()->setLockWindows($value);
};
$this->mappings['security']['revisionsPassword'] = function ($value) use ($wrapper) {
$wrapper->object->getSecurity()->setRevisionsPassword($value);
$this->mappings['security']['revisionsPassword'] = function ($value) {
$this->object->getSecurity()->setRevisionsPassword($value);
};
$this->mappings['security']['workbookPassword'] = function ($value) use ($wrapper) {
$wrapper->object->getSecurity()->setWorkbookPassword($value);
$this->mappings['security']['workbookPassword'] = function ($value) {
$this->object->getSecurity()->setWorkbookPassword($value);
};
$this->mappings['subject'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setSubject($value);
$this->mappings['subject'] = function ($value) {
$this->object->getProperties()->setSubject($value);
};
$this->mappings['title'] = function ($value) use ($wrapper) {
$wrapper->object->getProperties()->setTitle($value);
$this->mappings['title'] = function ($value) {
$this->object->getProperties()->setTitle($value);
};
}

Expand Down
71 changes: 34 additions & 37 deletions Wrapper/XlsDrawingWrapper.php
View file
Expand Up @@ -55,62 +55,59 @@ public function __construct(array $context, XlsSheetWrapper $sheetWrapper, XlsHe

protected function initializeMappings()
{
$wrapper = $this; // PHP 5.3 fix

$this->mappings['coordinates'] = function ($value) use ($wrapper) {
$wrapper->object->setCoordinates($value);
$this->mappings['coordinates'] = function ($value) {
$this->object->setCoordinates($value);
};
$this->mappings['description'] = function ($value) use ($wrapper) {
$wrapper->object->setDescription($value);
$this->mappings['description'] = function ($value) {
$this->object->setDescription($value);
};
$this->mappings['height'] = function ($value) use ($wrapper) {
$wrapper->object->setHeight($value);
$this->mappings['height'] = function ($value) {
$this->object->setHeight($value);
};
$this->mappings['name'] = function ($value) use ($wrapper) {
$wrapper->object->setName($value);
$this->mappings['name'] = function ($value) {
$this->object->setName($value);
};
$this->mappings['offsetX'] = function ($value) use ($wrapper) {
$wrapper->object->setOffsetX($value);
$this->mappings['offsetX'] = function ($value) {
$this->object->setOffsetX($value);
};
$this->mappings['offsetY'] = function ($value) use ($wrapper) {
$wrapper->object->setOffsetY($value);
$this->mappings['offsetY'] = function ($value) {
$this->object->setOffsetY($value);
};
$this->mappings['resizeProportional'] = function ($value) use ($wrapper) {
$wrapper->object->setResizeProportional($value);
$this->mappings['resizeProportional'] = function ($value) {
$this->object->setResizeProportional($value);
};
$this->mappings['rotation'] = function ($value) use ($wrapper) {
$wrapper->object->setRotation($value);
$this->mappings['rotation'] = function ($value) {
$this->object->setRotation($value);
};
$this->mappings['shadow']['alignment'] = function ($value) use ($wrapper) {
$wrapper->object->getShadow()->setAlignment($value);
$this->mappings['shadow']['alignment'] = function ($value) {
$this->object->getShadow()->setAlignment($value);
};
$this->mappings['shadow']['alpha'] = function ($value) use ($wrapper) {
$wrapper->object->getShadow()->setAlpha($value);
$this->mappings['shadow']['alpha'] = function ($value) {
$this->object->getShadow()->setAlpha($value);
};
$this->mappings['shadow']['blurRadius'] = function ($value) use ($wrapper) {
$wrapper->object->getShadow()->setBlurRadius($value);
$this->mappings['shadow']['blurRadius'] = function ($value) {
$this->object->getShadow()->setBlurRadius($value);
};
$this->mappings['shadow']['color'] = function ($value) use ($wrapper) {
$wrapper->object->getShadow()->getColor()->setRGB($value);
$this->mappings['shadow']['color'] = function ($value) {
$this->object->getShadow()->getColor()->setRGB($value);
};
$this->mappings['shadow']['direction'] = function ($value) use ($wrapper) {
$wrapper->object->getShadow()->setDirection($value);
$this->mappings['shadow']['direction'] = function ($value) {
$this->object->getShadow()->setDirection($value);
};
$this->mappings['shadow']['distance'] = function ($value) use ($wrapper) {
$wrapper->object->getShadow()->setDistance($value);
$this->mappings['shadow']['distance'] = function ($value) {
$this->object->getShadow()->setDistance($value);
};
$this->mappings['shadow']['visible'] = function ($value) use ($wrapper) {
$wrapper->object->getShadow()->setVisible($value);
$this->mappings['shadow']['visible'] = function ($value) {
$this->object->getShadow()->setVisible($value);
};
$this->mappings['width'] = function ($value) use ($wrapper) {
$wrapper->object->setWidth($value);
$this->mappings['width'] = function ($value) {
$this->object->setWidth($value);
};
}

/**
* @param string $path
* @param array $properties
*
* @param $path
* @param array|null $properties
* @throws \PHPExcel_Exception
*/
public function start($path, array $properties = null)
Expand Down
10 changes: 4 additions & 6 deletions Wrapper/XlsHeaderFooterWrapper.php
View file
Expand Up @@ -56,13 +56,11 @@ public function __construct(array $context, XlsSheetWrapper $sheetWrapper)

protected function initializeMappings()
{
$wrapper = $this; // PHP 5.3 fix

$this->mappings['scaleWithDocument'] = function ($value) use ($wrapper) {
$wrapper->object->setScaleWithDocument($value);
$this->mappings['scaleWithDocument'] = function ($value) {
$this->object->setScaleWithDocument($value);
};
$this->mappings['alignWithMargins'] = function ($value) use ($wrapper) {
$wrapper->object->setAlignWithMargins($value);
$this->mappings['alignWithMargins'] = function ($value) {
$this->object->setAlignWithMargins($value);
};
}

Expand Down

0 comments on commit 62863b3

Please sign in to comment.