Replaced array_key_exists with isset for better performance.

Roman Syroeshko · Roman Syroeshko · commit 4445fd325808 · 2014-10-10T21:10:29.000+04:00
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
@@ -92,7 +92,7 @@ public function __call($function, $args)
 
         // Run valid `add` command
         $function = strtolower($function);
-        if (array_key_exists($function, $functions)) {
+        if (isset($functions[$function])) {
             $element = $functions[$function];
 
             // Special case for TextBreak
@@ -183,23 +183,22 @@ public function countElements()
      */
     private function checkValidity($method)
     {
-        // Valid containers for each element
-        $allContainers = array(
-            'Section', 'Header', 'Footer', 'Footnote', 'Endnote',
-            'Cell', 'TextRun', 'TextBox', 'ListItemRun',
+        $generalContainers = array(
+            'Section', 'Header', 'Footer', 'Footnote', 'Endnote', 'Cell', 'TextRun', 'TextBox', 'ListItemRun',
         );
+
         $validContainers = array(
-            'Text'          => $allContainers,
-            'Bookmark'      => $allContainers,
-            'Link'          => $allContainers,
-            'TextBreak'     => $allContainers,
-            'Image'         => $allContainers,
-            'Object'        => $allContainers,
-            'Field'         => $allContainers,
-            'Line'          => $allContainers,
-            'Shape'         => $allContainers,
-            'FormField'     => $allContainers,
-            'SDT'           => $allContainers,
+            'Text'          => $generalContainers,
+            'Bookmark'      => $generalContainers,
+            'Link'          => $generalContainers,
+            'TextBreak'     => $generalContainers,
+            'Image'         => $generalContainers,
+            'Object'        => $generalContainers,
+            'Field'         => $generalContainers,
+            'Line'          => $generalContainers,
+            'Shape'         => $generalContainers,
+            'FormField'     => $generalContainers,
+            'SDT'           => $generalContainers,
             'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'ListItem'      => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'ListItemRun'   => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
@@ -214,6 +213,7 @@ private function checkValidity($method)
             'PageBreak'     => array('Section'),
             'Chart'         => array('Section'),
         );
+
         // Special condition, e.g. preservetext can only exists in cell when
         // the cell is located in header or footer
         $validSubcontainers = array(
@@ -223,19 +223,20 @@ private function checkValidity($method)
         );
 
         // Check if a method is valid for current container
-        if (array_key_exists($method, $validContainers)) {
+        if (isset($validContainers[$method])) {
             if (!in_array($this->container, $validContainers[$method])) {
-                throw new \BadMethodCallException("Cannot add $method in $this->container.");
+                throw new \BadMethodCallException("Cannot add {$method} in {$this->container}.");
             }
         }
+
         // Check if a method is valid for current container, located in other container
-        if (array_key_exists($method, $validSubcontainers)) {
+        if (isset($validSubcontainers[$method])) {
             $rules = $validSubcontainers[$method];
             $containers = $rules[0];
             $allowedDocParts = $rules[1];
             foreach ($containers as $container) {
                 if ($this->container == $container && !in_array($this->getDocPart(), $allowedDocParts)) {
-                    throw new \BadMethodCallException("Cannot add $method in $this->container.");
+                    throw new \BadMethodCallException("Cannot add {$method} in {$this->container}.");
                 }
             }
         }
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
@@ -100,7 +100,7 @@ public function __construct($type = null, $properties = array(), $options = arra
     public function setType($type = null)
     {
         if (isset($type)) {
-            if (array_key_exists($type, $this->fieldsArray)) {
+            if (isset($this->fieldsArray[$type])) {
                 $this->type = $type;
             } else {
                 throw new \InvalidArgumentException("Invalid type");
@@ -130,7 +130,7 @@ public function setProperties($properties = array())
     {
         if (is_array($properties)) {
             foreach (array_keys($properties) as $propkey) {
-                if (!(array_key_exists($propkey, $this->fieldsArray[$this->type]['properties']))) {
+                if (!(isset($this->fieldsArray[$this->type]['properties'][$propkey]))) {
                     throw new \InvalidArgumentException("Invalid property");
                 }
             }
@@ -160,7 +160,7 @@ public function setOptions($options = array())
     {
         if (is_array($options)) {
             foreach (array_keys($options) as $optionkey) {
-                if (!(array_key_exists($optionkey, $this->fieldsArray[$this->type]['options']))) {
+                if (!(isset($this->fieldsArray[$this->type]['options'][$optionkey]))) {
                     throw new \InvalidArgumentException("Invalid option");
                 }
             }
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
@@ -61,11 +61,10 @@ class Title extends AbstractElement
      */
     public function __construct($text, $depth = 1)
     {
-
         $this->text = String::toUTF8($text);
         $this->depth = $depth;
-        if (array_key_exists('Heading_' . $this->depth, Style::getStyles())) {
-            $this->style = 'Heading' . $this->depth;
+        if (array_key_exists("Heading_{$this->depth}", Style::getStyles())) {
+            $this->style = "Heading{$this->depth}";
         }
 
         return $this;
diff --git a/src/PhpWord/Media.php b/src/PhpWord/Media.php
@@ -48,12 +48,12 @@ public static function addElement($container, $mediaType, $source, Image $image
     {
         // Assign unique media Id and initiate media container if none exists
         $mediaId = md5($container . $source);
-        if (!array_key_exists($container, self::$elements)) {
+        if (!isset(self::$elements[$container])) {
             self::$elements[$container] = array();
         }
 
         // Add media if not exists or point to existing media
-        if (!array_key_exists($mediaId, self::$elements[$container])) {
+        if (!isset(self::$elements[$container][$mediaId])) {
             $mediaCount = self::countElements($container);
             $mediaTypeCount = self::countElements($container, $mediaType);
             $mediaTypeCount++;
@@ -120,7 +120,7 @@ public static function countElements($container, $mediaType = null)
     {
         $mediaCount = 0;
 
-        if (array_key_exists($container, self::$elements)) {
+        if (isset(self::$elements[$container])) {
             foreach (self::$elements[$container] as $mediaData) {
                 if (!is_null($mediaType)) {
                     if ($mediaType == $mediaData['type']) {
@@ -156,7 +156,7 @@ public static function getElements($container, $type = null)
             }
             return $elements;
         } else {
-            if (!array_key_exists($container, self::$elements)) {
+            if (!isset(self::$elements[$container])) {
                 return $elements;
             }
             return self::getElementsByType($container, $type);
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
@@ -139,7 +139,7 @@ public function __call($function, $args)
             /** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collectionObject */
             $collectionObject = $this->collections[$key];
 
-            return $collectionObject->addItem(array_key_exists(0, $args) ? $args[0] : null);
+            return $collectionObject->addItem(isset($args[0]) ? $args[0] : null);
         }
 
         // Run add style method
diff --git a/src/PhpWord/Reader/RTF/Document.php b/src/PhpWord/Reader/RTF/Document.php
@@ -155,7 +155,7 @@ public function read(PhpWord $phpWord)
             $char  = $this->rtf[$this->offset];
             $ascii = ord($char);
 
-            if (array_key_exists($ascii, $markers)) { // Marker found: {, }, \, LF, or CR
+            if (isset($markers[$ascii])) { // Marker found: {, }, \, LF, or CR
                 $markerFunction = $markers[$ascii];
                 $this->$markerFunction();
             } else {
@@ -351,7 +351,7 @@ private function parseControl($control, $parameter)
             'fldinst'   => array(self::SKIP,    'link',         null),
         );
 
-        if (array_key_exists($control, $controls)) {
+        if (isset($controls[$control])) {
             list($function) = $controls[$control];
             if (method_exists($this, $function)) {
                 $directives = $controls[$control];
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
@@ -63,7 +63,7 @@ public function load($docFile)
             $stepItems = $step['stepItems'];
             foreach ($relationships[$stepPart] as $relItem) {
                 $relType = $relItem['type'];
-                if (array_key_exists($relType, $stepItems)) {
+                if (isset($stepItems[$relType])) {
                     $partName = $stepItems[$relType];
                     $xmlFile = $relItem['target'];
                     $this->readPart($phpWord, $relationships, $partName, $docFile, $xmlFile);
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -107,7 +107,7 @@ protected function readParagraph(XMLReader $xmlReader, \DOMElement $domNode, $pa
         $headingMatches = array();
         if ($xmlReader->elementExists('w:pPr', $domNode)) {
             $paragraphStyle = $this->readParagraphStyle($xmlReader, $domNode);
-            if (is_array($paragraphStyle) && array_key_exists('styleName', $paragraphStyle)) {
+            if (is_array($paragraphStyle) && isset($paragraphStyle['styleName'])) {
                 preg_match('/Heading(\d)/', $paragraphStyle['styleName'], $headingMatches);
             }
         }
@@ -505,10 +505,9 @@ private function readStyleDef($method, $attributeValue, $expected)
     private function getMediaTarget($docPart, $rId)
     {
         $target = null;
-        if (array_key_exists($docPart, $this->rels)) {
-            if (array_key_exists($rId, $this->rels[$docPart])) {
-                $target = $this->rels[$docPart][$rId]['target'];
-            }
+
+        if (isset($this->rels[$docPart]) && isset($this->rels[$docPart][$rId])) {
+            $target = $this->rels[$docPart][$rId]['target'];
         }
 
         return $target;
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCore.php b/src/PhpWord/Reader/Word2007/DocPropsCore.php
@@ -67,12 +67,12 @@ public function read(PhpWord $phpWord)
         $nodes = $xmlReader->getElements('*');
         if ($nodes->length > 0) {
             foreach ($nodes as $node) {
-                if (!array_key_exists($node->nodeName, $this->mapping)) {
+                if (!isset($this->mapping[$node->nodeName])) {
                     continue;
                 }
                 $method = $this->mapping[$node->nodeName];
                 $value = $node->nodeValue == '' ? null : $node->nodeValue;
-                if (array_key_exists($node->nodeName, $this->callbacks)) {
+                if (isset($this->callbacks[$node->nodeName])) {
                     $value = $this->callbacks[$node->nodeName]($value);
                 }
                 if (method_exists($docProps, $method)) {
diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php
@@ -53,7 +53,7 @@ public function read(PhpWord $phpWord)
         if ($nodes->length > 0) {
             $section = $this->phpWord->addSection();
             foreach ($nodes as $node) {
-                if (array_key_exists($node->nodeName, $readMethods)) {
+                if (isset($readMethods[$node->nodeName])) {
                     $readMethod = $readMethods[$node->nodeName];
                     $this->$readMethod($xmlReader, $node, $section);
                 }
@@ -72,9 +72,9 @@ private function readHeaderFooter($settings, Section &$section)
     {
         $readMethods = array('w:p' => 'readParagraph', 'w:tbl' => 'readTable');
 
-        if (is_array($settings) && array_key_exists('hf', $settings)) {
+        if (is_array($settings) && isset($settings['hf'])) {
             foreach ($settings['hf'] as $rId => $hfSetting) {
-                if (array_key_exists($rId, $this->rels['document'])) {
+                if (isset($this->rels['document'][$rId])) {
                     list($hfType, $xmlFile, $docPart) = array_values($this->rels['document'][$rId]);
                     $addMethod = "add{$hfType}";
                     $hfObject = $section->$addMethod($hfSetting['type']);
@@ -85,7 +85,7 @@ private function readHeaderFooter($settings, Section &$section)
                     $nodes = $xmlReader->getElements('*');
                     if ($nodes->length > 0) {
                         foreach ($nodes as $node) {
-                            if (array_key_exists($node->nodeName, $readMethods)) {
+                            if (isset($readMethods[$node->nodeName])) {
                                 $readMethod = $readMethods[$node->nodeName];
                                 $this->$readMethod($xmlReader, $node, $hfObject, $docPart);
                             }
diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -62,7 +62,7 @@ public function read(PhpWord $phpWord)
 
                 // Avoid w:type "separator" and "continuationSeparator"
                 // Only look for <footnote> or <endnote> without w:type attribute
-                if (is_null($type) && array_key_exists($id, $collection)) {
+                if (is_null($type) && isset($collection[$id])) {
                     $element = $collection[$id];
                     $pNodes = $xmlReader->getElements('w:p/*', $node);
                     foreach ($pNodes as $pNode) {
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -133,8 +133,7 @@ protected static function parseNode($node, $element, $styles = array(), $data =
         $newElement = null;
         $keys = array('node', 'element', 'styles', 'data', 'argument1', 'argument2');
 
-        if (array_key_exists($node->nodeName, $nodes)) {
-
+        if (isset($nodes[$node->nodeName])) {
             // Execute method based on node mapping table and return $newElement or null
             // Arguments are passed by reference
             $arguments = array();
diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php
@@ -163,7 +163,7 @@ public static function getStyles()
      */
     public static function getStyle($styleName)
     {
-        if (array_key_exists($styleName, self::$styles)) {
+        if (isset(self::$styles[$styleName])) {
             return self::$styles[$styleName];
         } else {
             return null;
@@ -182,7 +182,7 @@ public static function getStyle($styleName)
      */
     private static function setStyleValues($name, $style, $value = null)
     {
-        if (!array_key_exists($name, self::$styles)) {
+        if (!isset(self::$styles[$name])) {
             if ($value !== null) {
                 if (is_array($value)) {
                     $style->setStyleByArray($value);
diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
@@ -343,7 +343,7 @@ protected function addFilesToPackage(ZipArchive $zip, $elements)
             $type = $element['type']; // image|object|link
 
             // Skip nonregistered types and set target
-            if (!array_key_exists($type, $this->mediaPaths)) {
+            if (!isset($this->mediaPaths[$type])) {
                 continue;
             }
             $target = $this->mediaPaths[$type] . $element['target'];
diff --git a/src/PhpWord/Writer/HTML/Part/Body.php b/src/PhpWord/Writer/HTML/Part/Body.php
@@ -72,7 +72,7 @@ private function writeNotes()
                 $method = 'get' . ($noteType == 'endnote' ? 'Endnotes' : 'Footnotes');
                 $collection = $phpWord->$method()->getItems();
 
-                if (array_key_exists($noteTypeId, $collection)) {
+                if (isset($collection[$noteTypeId])) {
                     $element = $collection[$noteTypeId];
                     $noteAnchor = "<a name=\"note-{$noteId}\" />";
                     $noteAnchor .= "<a href=\"#{$noteMark}\" class=\"NoteRef\"><sup>{$noteId}</sup></a>";
diff --git a/src/PhpWord/Writer/RTF/Part/Document.php b/src/PhpWord/Writer/RTF/Part/Document.php
@@ -64,7 +64,7 @@ private function writeInfo()
         $content .= '{';
         $content .= '\info';
         foreach ($properties as $property) {
-            $method = 'get' . (array_key_exists($property, $mapping) ? $mapping[$property] : $property);
+            $method = 'get' . (isset($mapping[$property]) ? $mapping[$property] : $property);
             $value = $docProps->$method();
             $value = in_array($property, $dateFields) ? $this->getDateValue($value) : $value;
             $content .= "{\\{$property} {$value}}";
diff --git a/src/PhpWord/Writer/Word2007.php b/src/PhpWord/Writer/Word2007.php
@@ -302,11 +302,11 @@ private function registerContentTypes($media)
             $mediumType = $medium['type'];
             if ($mediumType == 'image') {
                 $extension = $medium['imageExtension'];
-                if (!array_key_exists($extension, $this->contentTypes['default'])) {
+                if (!isset($this->contentTypes['default'][$extension])) {
                     $this->contentTypes['default'][$extension] = $medium['imageType'];
                 }
             } elseif ($mediumType == 'object') {
-                if (!array_key_exists('bin', $this->contentTypes['default'])) {
+                if (!isset($this->contentTypes['default']['bin'])) {
                     $this->contentTypes['default']['bin'] = 'application/vnd.openxmlformats-officedocument.oleObject';
                 }
             }
diff --git a/src/PhpWord/Writer/Word2007/Part/Rels.php b/src/PhpWord/Writer/Word2007/Part/Rels.php
@@ -89,8 +89,8 @@ private function writeMediaRel(XMLWriter $xmlWriter, $relId, $mediaRel)
         $targetMapping = array('image' => 'media/', 'object' => 'embeddings/');
 
         $mediaType = $mediaRel['type'];
-        $type = array_key_exists($mediaType, $typeMapping) ? $typeMapping[$mediaType] : $mediaType;
-        $targetPrefix = array_key_exists($mediaType, $targetMapping) ? $targetMapping[$mediaType] : '';
+        $type = isset($typeMapping[$mediaType]) ? $typeMapping[$mediaType] : $mediaType;
+        $targetPrefix = isset($targetMapping[$mediaType]) ? $targetMapping[$mediaType] : '';
         $target = $mediaRel['target'];
         $targetMode = ($type == 'hyperlink') ? 'External' : '';
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -19,9 +19,9 @@
 
 use PhpOffice\PhpWord\Settings as PhpWordSettings;
 use PhpOffice\PhpWord\Shared\XMLWriter;
+use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font as FontStyle;
 use PhpOffice\PhpWord\Style\Paragraph as ParagraphStyle;
-use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Table as TableStyle;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Font as FontStyleWriter;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
@@ -114,14 +114,14 @@ private function writeDefaultStyles(XMLWriter $xmlWriter, $styles)
         $xmlWriter->startElement('w:name');
         $xmlWriter->writeAttribute('w:val', 'Normal');
         $xmlWriter->endElement(); // w:name
-        if (array_key_exists('Normal', $styles)) {
+        if (isset($styles['Normal'])) {
             $styleWriter = new ParagraphStyleWriter($xmlWriter, $styles['Normal']);
             $styleWriter->write();
         }
         $xmlWriter->endElement(); // w:style
 
         // FootnoteReference style
-        if (!array_key_exists('FootnoteReference', $styles)) {
+        if (!isset($styles['FootnoteReference'])) {
             $xmlWriter->startElement('w:style');
             $xmlWriter->writeAttribute('w:type', 'character');
             $xmlWriter->writeAttribute('w:styleId', 'FootnoteReference');
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -64,7 +64,7 @@ public function write()
 
        // zIndex for infront & behind wrap
         $wrap = $style->getWrap();
-        if ($wrap !== null && array_key_exists($wrap, $zIndices)) {
+        if ($wrap !== null && isset($zIndices[$wrap])) {
             $styles['z-index'] = $zIndices[$wrap];
             $wrap = null;
         }
@@ -124,10 +124,10 @@ private function writeWrap(XMLWriter $xmlWriter, FrameStyle $style, $wrap)
                 $xmlWriter->writeAttribute('anchorx', "page");
                 $xmlWriter->writeAttribute('anchory', "page");
             } elseif ($pos == FrameStyle::POS_RELATIVE) {
-                if (array_key_exists($hPos, $relativePositions)) {
+                if (isset($relativePositions[$hPos])) {
                     $xmlWriter->writeAttribute('anchorx', $relativePositions[$hPos]);
                 }
-                if (array_key_exists($vPos, $relativePositions)) {
+                if (isset($relativePositions[$vPos])) {
                     $xmlWriter->writeAttribute('anchory', $relativePositions[$vPos]);
                 }
             }
diff --git a/src/PhpWord/Writer/Word2007/Style/Line.php b/src/PhpWord/Writer/Word2007/Style/Line.php
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function __construct($type = null, $properties = array(), $options = arra`
`100`	`100`	`public function setType($type = null)`
`101`	`101`	`{`
`102`	`102`	`if (isset($type)) {`
`103`		`- if (array_key_exists($type, $this->fieldsArray)) {`
	`103`	`+ if (isset($this->fieldsArray[$type])) {`
`104`	`104`	`$this->type = $type;`
`105`	`105`	`} else {`
`106`	`106`	`throw new \InvalidArgumentException("Invalid type");`
`@@ -130,7 +130,7 @@ public function setProperties($properties = array())`
`130`	`130`	`{`
`131`	`131`	`if (is_array($properties)) {`
`132`	`132`	`foreach (array_keys($properties) as $propkey) {`
`133`		`- if (!(array_key_exists($propkey, $this->fieldsArray[$this->type]['properties']))) {`
	`133`	`+ if (!(isset($this->fieldsArray[$this->type]['properties'][$propkey]))) {`
`134`	`134`	`throw new \InvalidArgumentException("Invalid property");`
`135`	`135`	`}`
`136`	`136`	`}`
`@@ -160,7 +160,7 @@ public function setOptions($options = array())`
`160`	`160`	`{`
`161`	`161`	`if (is_array($options)) {`
`162`	`162`	`foreach (array_keys($options) as $optionkey) {`
`163`		`- if (!(array_key_exists($optionkey, $this->fieldsArray[$this->type]['options']))) {`
	`163`	`+ if (!(isset($this->fieldsArray[$this->type]['options'][$optionkey]))) {`
`164`	`164`	`throw new \InvalidArgumentException("Invalid option");`
`165`	`165`	`}`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,10 @@ class Title extends AbstractElement`
`61`	`61`	`*/`
`62`	`62`	`public function __construct($text, $depth = 1)`
`63`	`63`	`{`
`64`		`-`
`65`	`64`	`$this->text = String::toUTF8($text);`
`66`	`65`	`$this->depth = $depth;`
`67`		`- if (array_key_exists('Heading_' . $this->depth, Style::getStyles())) {`
`68`		`- $this->style = 'Heading' . $this->depth;`
	`66`	`+ if (array_key_exists("Heading_{$this->depth}", Style::getStyles())) {`
	`67`	`+ $this->style = "Heading{$this->depth}";`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ public static function addElement($container, $mediaType, $source, Image $image`
`48`	`48`	`{`
`49`	`49`	`// Assign unique media Id and initiate media container if none exists`
`50`	`50`	`$mediaId = md5($container . $source);`
`51`		`- if (!array_key_exists($container, self::$elements)) {`
	`51`	`+ if (!isset(self::$elements[$container])) {`
`52`	`52`	`self::$elements[$container] = array();`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// Add media if not exists or point to existing media`
`56`		`- if (!array_key_exists($mediaId, self::$elements[$container])) {`
	`56`	`+ if (!isset(self::$elements[$container][$mediaId])) {`
`57`	`57`	`$mediaCount = self::countElements($container);`
`58`	`58`	`$mediaTypeCount = self::countElements($container, $mediaType);`
`59`	`59`	`$mediaTypeCount++;`
`@@ -120,7 +120,7 @@ public static function countElements($container, $mediaType = null)`
`120`	`120`	`{`
`121`	`121`	`$mediaCount = 0;`
`122`	`122`
`123`		`- if (array_key_exists($container, self::$elements)) {`
	`123`	`+ if (isset(self::$elements[$container])) {`
`124`	`124`	`foreach (self::$elements[$container] as $mediaData) {`
`125`	`125`	`if (!is_null($mediaType)) {`
`126`	`126`	`if ($mediaType == $mediaData['type']) {`
`@@ -156,7 +156,7 @@ public static function getElements($container, $type = null)`
`156`	`156`	`}`
`157`	`157`	`return $elements;`
`158`	`158`	`} else {`
`159`		`- if (!array_key_exists($container, self::$elements)) {`
	`159`	`+ if (!isset(self::$elements[$container])) {`
`160`	`160`	`return $elements;`
`161`	`161`	`}`
`162`	`162`	`return self::getElementsByType($container, $type);`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function __call($function, $args)`
`139`	`139`	`/** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collectionObject */`
`140`	`140`	`$collectionObject = $this->collections[$key];`
`141`	`141`
`142`		`- return $collectionObject->addItem(array_key_exists(0, $args) ? $args[0] : null);`
	`142`	`+ return $collectionObject->addItem(isset($args[0]) ? $args[0] : null);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`// Run add style method`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ protected function readParagraph(XMLReader $xmlReader, \DOMElement $domNode, $pa`
`107`	`107`	`$headingMatches = array();`
`108`	`108`	`if ($xmlReader->elementExists('w:pPr', $domNode)) {`
`109`	`109`	`$paragraphStyle = $this->readParagraphStyle($xmlReader, $domNode);`
`110`		`- if (is_array($paragraphStyle) && array_key_exists('styleName', $paragraphStyle)) {`
	`110`	`+ if (is_array($paragraphStyle) && isset($paragraphStyle['styleName'])) {`
`111`	`111`	`preg_match('/Heading(\d)/', $paragraphStyle['styleName'], $headingMatches);`
`112`	`112`	`}`
`113`	`113`	`}`
`@@ -505,10 +505,9 @@ private function readStyleDef($method, $attributeValue, $expected)`
`505`	`505`	`private function getMediaTarget($docPart, $rId)`
`506`	`506`	`{`
`507`	`507`	`$target = null;`
`508`		`- if (array_key_exists($docPart, $this->rels)) {`
`509`		`- if (array_key_exists($rId, $this->rels[$docPart])) {`
`510`		`- $target = $this->rels[$docPart][$rId]['target'];`
`511`		`- }`
	`508`	`+`
	`509`	`+ if (isset($this->rels[$docPart]) && isset($this->rels[$docPart][$rId])) {`
	`510`	`+ $target = $this->rels[$docPart][$rId]['target'];`
`512`	`511`	`}`
`513`	`512`
`514`	`513`	`return $target;`