diff --git a/composer.lock b/composer.lock index 9f7b4af3..68a3f5b6 100644 --- a/composer.lock +++ b/composer.lock @@ -314,12 +314,12 @@ "source": { "type": "git", "url": "https://github.com/M2Mobi/lunr.halo.git", - "reference": "fdf80f3337f58b7da444294f64b55e9809ef842a" + "reference": "fcfa3ac57485e5e500313162dcb0941b71c3834a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/M2Mobi/lunr.halo/zipball/fdf80f3337f58b7da444294f64b55e9809ef842a", - "reference": "fdf80f3337f58b7da444294f64b55e9809ef842a", + "url": "https://api.github.com/repos/M2Mobi/lunr.halo/zipball/fcfa3ac57485e5e500313162dcb0941b71c3834a", + "reference": "fcfa3ac57485e5e500313162dcb0941b71c3834a", "shasum": "" }, "require": { @@ -348,20 +348,20 @@ "phpunit", "unit tests" ], - "time": "2019-12-23T15:44:55+00:00" + "time": "2020-02-04T08:27:08+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.9.4", + "version": "1.9.5", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "579bb7356d91f9456ccd505f24ca8b667966a0a7" + "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/579bb7356d91f9456ccd505f24ca8b667966a0a7", - "reference": "579bb7356d91f9456ccd505f24ca8b667966a0a7", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef", + "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef", "shasum": "" }, "require": { @@ -396,7 +396,7 @@ "object", "object graph" ], - "time": "2019-12-15T19:12:40+00:00" + "time": "2020-01-17T21:11:47+00:00" }, { "name": "phar-io/manifest", @@ -502,16 +502,16 @@ }, { "name": "phing/phing", - "version": "2.16.2", + "version": "2.16.3", "source": { "type": "git", "url": "https://github.com/phingofficial/phing.git", - "reference": "d11c6328c450cb3cda4ffa6548aa9cd60f30dd17" + "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phingofficial/phing/zipball/d11c6328c450cb3cda4ffa6548aa9cd60f30dd17", - "reference": "d11c6328c450cb3cda4ffa6548aa9cd60f30dd17", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/b34c2bf9cd6abd39b4287dee31e68673784c8567", + "reference": "b34c2bf9cd6abd39b4287dee31e68673784c8567", "shasum": "" }, "require": { @@ -591,7 +591,7 @@ "task", "tool" ], - "time": "2020-01-03T10:18:48+00:00" + "time": "2020-02-03T18:50:54+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -746,24 +746,24 @@ }, { "name": "phpspec/prophecy", - "version": "1.10.1", + "version": "v1.10.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc" + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/cbe1df668b3fe136bcc909126a0f529a78d4cbbc", - "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9", + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.2.3|^2.0|^3.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { "phpspec/phpspec": "^2.5 || ^3.2", @@ -805,7 +805,7 @@ "spy", "stub" ], - "time": "2019-12-22T21:05:45+00:00" + "time": "2020-01-20T15:57:02+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/src/PHPDraft/Model/Elements/ObjectStructureElement.php b/src/PHPDraft/Model/Elements/ObjectStructureElement.php index 29474035..f1efd97b 100644 --- a/src/PHPDraft/Model/Elements/ObjectStructureElement.php +++ b/src/PHPDraft/Model/Elements/ObjectStructureElement.php @@ -26,13 +26,13 @@ class ObjectStructureElement extends BasicStructureElement */ public function parse($object, array &$dependencies): StructureElement { - if (!isset($object->content) && isset($object->meta)) { - $this->element = $object->element; - $this->parse_common($object, $dependencies); + if (empty($object) || !isset($object->element) || !(isset($object->content) || isset($object->meta) ) ) { return $this; } - if (empty($object) || !(isset($object->content) || isset($object->meta)) ) { + if (!isset($object->content) && isset($object->meta)) { + $this->element = $object->element; + $this->parse_common($object, $dependencies); return $this; }