Fixes some deprecated

Author: Progi1984

samples/Sample_12_Reader_ODPresentation.php

@@ -4,16 +4,9 @@
 
 include_once 'Sample_Header.php';
 
-use PhpOffice\PhpPresentation\PhpPresentation;
-use PhpOffice\PhpPresentation\DocumentLayout;
 use PhpOffice\PhpPresentation\IOFactory;
-use PhpOffice\PhpPresentation\Style\Alignment;
-use PhpOffice\PhpPresentation\Style\Color;
 use PhpOffice\PhpPresentation\Slide;
-use PhpOffice\PhpPresentation\AbstractShape;
-use PhpOffice\PhpPresentation\Shape\MemoryDrawing;
 use PhpOffice\PhpPresentation\Shape\RichText;
-use PhpOffice\PhpPresentation\Shape\Group;
 
 $pptReader = IOFactory::createReader('ODPresentation');
 $oPHPPresentation = $pptReader->load('resources/Sample_12.odp');

samples/Sample_12_Reader_PowerPoint2007.php

@@ -4,16 +4,9 @@
 
 include_once 'Sample_Header.php';
 
-use PhpOffice\PhpPresentation\PhpPresentation;
-use PhpOffice\PhpPresentation\DocumentLayout;
 use PhpOffice\PhpPresentation\IOFactory;
-use PhpOffice\PhpPresentation\Style\Alignment;
-use PhpOffice\PhpPresentation\Style\Color;
 use PhpOffice\PhpPresentation\Slide;
-use PhpOffice\PhpPresentation\AbstractShape;
-use PhpOffice\PhpPresentation\Shape\MemoryDrawing;
 use PhpOffice\PhpPresentation\Shape\RichText;
-use PhpOffice\PhpPresentation\Shape\Group;
 
 $pptReader = IOFactory::createReader('PowerPoint2007');
 $oPHPPresentation = $pptReader->load('resources/Sample_12.pptx');

samples/Sample_12_Reader_PowerPoint97.php

@@ -4,18 +4,11 @@
 
 include_once 'Sample_Header.php';
 
-use PhpOffice\PhpPresentation\PhpPresentation;
-use PhpOffice\PhpPresentation\DocumentLayout;
 use PhpOffice\PhpPresentation\IOFactory;
-use PhpOffice\PhpPresentation\Style\Alignment;
-use PhpOffice\PhpPresentation\Style\Color;
 use PhpOffice\PhpPresentation\Slide;
-use PhpOffice\PhpPresentation\AbstractShape;
-use PhpOffice\PhpPresentation\Shape\MemoryDrawing;
 use PhpOffice\PhpPresentation\Shape\RichText;
-use PhpOffice\PhpPresentation\Shape\Group;
 
-$pptReader = PhpOffice\PhpPresentation\IOFactory::createReader('PowerPoint97');
+$pptReader = IOFactory::createReader('PowerPoint97');
 $oPHPPresentation = $pptReader->load('resources/Sample_12.ppt');
 
 $oTree = new PhpPptTree($oPHPPresentation);

samples/Sample_Header.php

@@ -10,7 +10,6 @@
 use PhpOffice\PhpPresentation\AbstractShape;
 use PhpOffice\PhpPresentation\DocumentLayout;
 use PhpOffice\PhpPresentation\Shape\Drawing;
-use PhpOffice\PhpPresentation\Shape\MemoryDrawing;
 use PhpOffice\PhpPresentation\Shape\RichText;
 use PhpOffice\PhpPresentation\Shape\RichText\BreakElement;
 use PhpOffice\PhpPresentation\Shape\RichText\TextElement;
@@ -325,7 +324,7 @@ protected function displayShapeInfo(AbstractShape $oShape)
         $this->append('<dt>Fill</dt><dd>@Todo</dd>');
         $this->append('<dt>Border</dt><dd>@Todo</dd>');
         $this->append('<dt>IsPlaceholder</dt><dd>' . ($oShape->isPlaceholder() ? 'true' : 'false') . '</dd>');
-        if($oShape instanceof MemoryDrawing) {
+        if($oShape instanceof Drawing\Gd) {
             $this->append('<dt>Name</dt><dd>'.$oShape->getName().'</dd>');
             $this->append('<dt>Description</dt><dd>'.$oShape->getDescription().'</dd>');
             ob_start();

src/PhpPresentation/Reader/PowerPoint97.php

@@ -18,18 +18,18 @@
 namespace PhpOffice\PhpPresentation\Reader;
 
 use PhpOffice\Common\Microsoft\OLERead;
-use PhpOffice\PhpPresentation\Shape\Drawing;
+use PhpOffice\Common\Text;
 use PhpOffice\PhpPresentation\PhpPresentation;
-use PhpOffice\PhpPresentation\Style\Alignment;
-use PhpOffice\PhpPresentation\Style\Color;
-use PhpOffice\PhpPresentation\Shape\RichText;
 use PhpOffice\PhpPresentation\AbstractShape;
-use PhpOffice\PhpPresentation\Style\Bullet;
+use PhpOffice\PhpPresentation\Shape;
+use PhpOffice\PhpPresentation\Shape\Drawing;
+use PhpOffice\PhpPresentation\Shape\Group;
 use PhpOffice\PhpPresentation\Shape\Hyperlink;
 use PhpOffice\PhpPresentation\Shape\Line;
-use PhpOffice\Common\Text;
-use PhpOffice\PhpPresentation\Shape\Group;
-use PhpOffice\PhpPresentation\Shape\PhpOffice\PhpPresentation\Shape;
+use PhpOffice\PhpPresentation\Shape\RichText;
+use PhpOffice\PhpPresentation\Style\Alignment;
+use PhpOffice\PhpPresentation\Style\Color;
+use PhpOffice\PhpPresentation\Style\Bullet;
 
 /**
  * Serialized format reader

src/PhpPresentation/Shape/Group.php

@@ -21,7 +21,6 @@
 use PhpOffice\PhpPresentation\GeometryCalculator;
 use PHPOffice\PhpPresentation\ShapeContainerInterface;
 use PhpOffice\PhpPresentation\Shape\Drawing;
-use PhpOffice\PhpPresentation\Shape\Line;
 use PhpOffice\PhpPresentation\Shape\RichText;
 use PhpOffice\PhpPresentation\Shape\Table;
 

src/PhpPresentation/Writer/ODPresentation/MetaInfManifest.php

@@ -3,7 +3,6 @@
 namespace PhpOffice\PhpPresentation\Writer\ODPresentation;
 
 use PhpOffice\Common\Adapter\Zip\ZipInterface;
-use PhpOffice\Common\File;
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpPresentation\Shape\Drawing as ShapeDrawing;
 use PhpOffice\PhpPresentation\Slide\Background\Image;

src/PhpPresentation/Writer/PowerPoint2007/PptMedia.php

@@ -2,7 +2,7 @@
 
 namespace PhpOffice\PhpPresentation\Writer\PowerPoint2007;
 
-use PhpOffice\PhpPresentation\Shape\Drawing;
+use PhpOffice\PhpPresentation\Shape\Drawing\AbstractDrawingAdapter;
 
 class PptMedia extends AbstractDecoratorWriter
 {
@@ -13,7 +13,7 @@ public function render()
     {
         for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
             $shape = $this->getDrawingHashTable()->getByIndex($i);
-            if (!$shape instanceof Drawing\AbstractDrawingAdapter) {
+            if (!$shape instanceof AbstractDrawingAdapter) {
                 continue;
             }
             $this->getZip()->addFromString('ppt/media/' . $shape->getIndexedFilename(), $shape->getContents());