Merge pull request #1 from khorsky/php72-compatibility

fix PHP 7.2+ compatibility

Author: hfig

src/MAPI/Item/Attachment.php

@@ -2,10 +2,10 @@
 
 namespace Hfig\MAPI\Item;
 
-abstract class Attachment extends Object
+abstract class Attachment extends MapiObject
 {
     protected $embedded_msg = null;
-    protected $embeded_ole = null;
+    protected $embedded_ole = null;
 
     public function getFilename()
     {
@@ -14,7 +14,7 @@ public function getFilename()
 
     public function getData()
     {
-        return $this->embedded_msg ?? $this->embeded_ole ?? $this->properties['attach_data'] ?? null;
+        return $this->embedded_msg ?? $this->embedded_ole ?? $this->properties['attach_data'] ?? null;
     }
 
     public function copyToStream($stream)
@@ -30,7 +30,7 @@ protected function storeEmbeddedOle($stream)
         // this is very untested...
         //throw new \RuntimeException('Saving an OLE Compound Document is not supported');
 
-        $this->embeded_ole->saveToStream($stream);
+        $this->embedded_ole->saveToStream($stream);
     }
 
 

src/MAPI/Item/Object.php src/MAPI/Item/MapiObject.phpsrc/MAPI/Item/Object.php renamed to src/MAPI/Item/MapiObject.php

@@ -1,15 +1,15 @@
-<?php
-
-namespace Hfig\MAPI\Item;
-
-class Object
-{
-    protected $properties;
-
-    public function __construct($properties)
-    {
-        $this->properties = $properties;
-    }
-
-
+<?php
+
+namespace Hfig\MAPI\Item;
+
+class MapiObject
+{
+    protected $properties;
+
+    public function __construct($properties)
+    {
+        $this->properties = $properties;
+    }
+
+
 }

src/MAPI/Item/Message.php

@@ -5,7 +5,7 @@
 //# IMessage essentially, but there's also stuff like IMAPIFolder etc. so, for this to form
 //# basis for PST Item, it'd need to be more general.
 
-abstract class Message extends Object
+abstract class Message extends MapiObject
 {
     abstract public function getAttachments();
     abstract public function getRecipients();

src/MAPI/Item/Recipient.php

@@ -2,7 +2,7 @@
 
 namespace Hfig\MAPI\Item;
 
-class Recipient extends Object
+class Recipient extends MapiObject
 {
     const RECIPIENT_TYPES = [
         0 => 'From',

src/MAPI/Message/Attachment.php

@@ -20,16 +20,16 @@ class Attachment extends AttachmentItem
     /** @var PropertySet */
     protected $properties;
 
-    protected $embeded_ole_type;
+    protected $embedded_ole_type;
 
     public function __construct(Element $obj, Message $parent)
     {
         $this->obj = $obj;
         $this->parent = $parent;
 
         $this->embedded_msg = null;
-        $this->embeded_ole  = null;
-        $this->embeded_ole_type = '';
+        $this->embedded_ole  = null;
+        $this->embedded_ole_type = '';
 
         $this->properties = new PropertySet(
             new PropertyStore($obj, $parent->getNameId())
@@ -42,17 +42,17 @@ public function __construct(Element $obj, Message $parent)
             if ($child->isDirectory() && preg_match(PropertyStore::SUBSTG_RX, $child->getName(), $matches)) {
                 // magic numbers??
                 if ($matches[1] == '3701' && strtolower($matches[2]) == '000d') {
-                    $this->embeded_ole = $child;
+                    $this->embedded_ole = $child;
                 }
             }
 
         }
 
-        if ($this->embeded_ole) {
+        if ($this->embedded_ole) {
             $type = $this->checkEmbeddedOleType();
             if ($type == 'Microsoft Office Outlook Message') {
-                $this->embedded_msg = new Message($this->embeded_ole, $parent);
-            }            
+                $this->embedded_msg = new Message($this->embedded_ole, $parent);
+            }
         }
 
     }
@@ -62,7 +62,7 @@ protected function checkEmbeddedOleType()
         $found = 0;
         $type = null;
 
-        foreach ($this->embeded_ole->getChildren() as $child) {
+        foreach ($this->embedded_ole->getChildren() as $child) {
             if (preg_match('/__(substg|properties|recip|attach|nameid)/', $child->getName())) {
                 $found++;
                 if ($found > 2) break;
@@ -73,7 +73,7 @@ protected function checkEmbeddedOleType()
         }
 
         if ($type) {
-            $this->embeded_ole_type = $type;
+            $this->embedded_ole_type = $type;
         }
 
         return $type;
@@ -82,9 +82,9 @@ protected function checkEmbeddedOleType()
 
     public function getMimeType()
     {
-        
-        $mime = $this->properties['attach_mime_tag'] ?? $this->embeded_ole_type;
-        if (!$mime) {        
+
+        $mime = $this->properties['attach_mime_tag'] ?? $this->embedded_ole_type;
+        if (!$mime) {
             $mime = 'application/octet-stream';
         }
 

src/MAPI/Message/Message.php

@@ -160,7 +160,7 @@ public function getBodyHTML()
 
             if (!$this->bodyHTML) {
                 //jstewmc/rtf
-                throw new \Exception('No HTML or Embeded RTF body. Convert from RTF not implemented');
+                throw new \Exception('No HTML or Embedded RTF body. Convert from RTF not implemented');
             }
         }
 

src/MAPI/Mime/Swiftmailer/Attachment.php

@@ -49,7 +49,7 @@ public function toMime()
                 Message::wrap($this->embedded_msg)->toMime()
             );
         }
-        elseif ($this->embeded_ole) {
+        elseif ($this->embedded_ole) {
             // in practice this scenario doesn't seem to occur
             // MS Office documents are attached as files not
             // embedded ole objects