Fixed PHPCSFixer

Author: Progi1984

phpunit.xml.dist

@@ -30,4 +30,4 @@
     </testsuite>
   </testsuites>
   <logging/>
-</phpunit>
+</phpunit>

samples/Sample_21_Password.php

@@ -5,8 +5,6 @@
 include_once 'Sample_Header.php';
 
 use PhpOffice\PhpPresentation\IOFactory;
-use PhpOffice\PhpPresentation\Slide;
-use PhpOffice\PhpPresentation\Shape\RichText;
 
 echo '<h2>ODPresentation</h2>';
 $pptReader = IOFactory::createReader('ODPresentation');

samples/Sample_Header.php

@@ -17,17 +17,17 @@
 use PhpOffice\PhpPresentation\Style\Bullet;
 use PhpOffice\PhpPresentation\Style\Color;
 
-function hex_dump($data, $newline = "\n")
+function hex_dump($data, $newline = "\n"): void
 {
     static $from = '';
     static $to = '';
 
-    static $width = 16; # number of bytes per line
+    static $width = 16; // number of bytes per line
 
-    static $pad = '.'; # padding for non-visible characters
+    static $pad = '.'; // padding for non-visible characters
 
     if ($from === '') {
-        for ($i = 0; $i <= 0xFF; $i++) {
+        for ($i = 0; $i <= 0xFF; ++$i) {
             $from .= chr($i);
             $to .= ($i >= 0x20 && $i <= 0x7E) ? chr($i) : $pad;
         }
@@ -223,7 +223,7 @@ function createTemplatedSlide(PhpPresentation $objPHPPresentation): Slide
     return $slide;
 }
 
-class PhpPptTree
+class Sample_Header
 {
     protected $oPhpPresentation;
 
@@ -531,13 +531,13 @@ protected function getConstantName($class, $search, $startWith = '')
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <?php foreach ($files as $key => $fileStr)  :?>
+                    <?php foreach ($files as $key => $fileStr) { ?>
                 <li class="dropdown active">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-code fa-lg"></i>&nbsp;Samples <?php echo $key?>x<strong
                                 class="caret"></strong></a>
                         <ul class="dropdown-menu"><?php echo $fileStr; ?></ul>
                     </li>
-                <?php endforeach; ?>
+                <?php } ?>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
                     <li><a href="https://github.com/PHPOffice/PHPPresentation"><i class="fa fa-github fa-lg" title="GitHub"></i>&nbsp;</a></li>
@@ -548,4 +548,4 @@ class="caret"></strong></a>
         </div>
     </div>
 </div>
-<?php echo $pageHeading;
+<?php echo $pageHeading;

src/PhpPresentation/Reader/AbstractReader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPPresentation - A pure PHP library for reading and writing
  * presentations documents.
@@ -10,8 +11,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPPresentation/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPPresentation
- * @copyright   2009-2015 PHPPresentation contributors
+ * @see        https://github.com/PHPOffice/PHPPresentation
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -34,11 +35,13 @@ public function getPassword()
 
     /**
      * @param string $password
+     *
      * @return AbstractReader
      */
     public function setPassword($password)
     {
         $this->password = $password;
+
         return $this;
     }
-}
+}

src/PhpPresentation/Reader/ODPresentation.php

@@ -83,7 +83,7 @@ class ODPresentation extends AbstractReader implements ReaderInterface
     protected $oXMLReader;
 
     /**
-     * @var \PhpOffice\Common\XMLReader
+     * @var XMLReader
      */
     protected $oXMLMetaInfManifest;
 
@@ -773,8 +773,8 @@ protected function loadStylesFile(): void
 
     /**
      * @param string $filename
+     *
      * @return bool
-     * @throws \Exception
      */
     protected function loadFileFromODP($filename)
     {
@@ -787,7 +787,7 @@ protected function loadFileFromODP($filename)
             }
         }
         // Search file in META-INF/manifest.xml
-        $oElement = $this->oXMLMetaInfManifest->getElement('/manifest:manifest/manifest:file-entry[@manifest:full-path=\''.$filename.'\']');
+        $oElement = $this->oXMLMetaInfManifest->getElement('/manifest:manifest/manifest:file-entry[@manifest:full-path=\'' . $filename . '\']');
         if (!$oElement) {
             return false;
         }
@@ -798,14 +798,15 @@ protected function loadFileFromODP($filename)
         }
 
         $fileContent = $this->oZip->getFromName($filename);
-        if (!$fileContent){
+        if (!$fileContent) {
             return false;
         }
 
         // No Encrypted file
         if (!$bEncrypted) {
             $this->oXMLReader = new XMLReader();
             $this->oXMLReader->getDomFromString($fileContent);
+
             return true;
         }
 
@@ -851,7 +852,7 @@ protected function loadFileFromODP($filename)
         var_dump($iv);
 
         $pwdHash = hash('sha256', $this->getPassword());
-        echo 'sha256('.$this->getPassword().'): ';
+        echo 'sha256(' . $this->getPassword() . '): ';
         var_dump($pwdHash);
         //$pwdHash = substr($pwdHash, 0 , 32);
         //var_dump($pwdHash);
@@ -864,15 +865,15 @@ protected function loadFileFromODP($filename)
         //var_dump($key);
 
         $data = openssl_decrypt($fileContent, 'AES-256-CBC', $key, 0, $iv);
-        if(!$data) {
-            while ($msg = openssl_error_string())
+        if (!$data) {
+            while ($msg = openssl_error_string()) {
                 var_dump($msg);
+            }
             die();
-        } else {
-            var_dump($data);
-            $data = gzinflate($data);
-            var_dump($data);
         }
+        var_dump($data);
+        $data = gzinflate($data);
+        var_dump($data);
 
         /*$data = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $fileContent, MCRYPT_MODE_CBC, $iv);
         var_dump($data);
@@ -884,18 +885,16 @@ protected function loadFileFromODP($filename)
         return false;
     }
 
-    protected function hash_pbkdf2($a = 'sha256', $password, $salt, $rounds = 5000, $key_length = 32, $raw_output = false)
+    protected function hash_pbkdf2($a, $password, $salt, $rounds = 5000, $key_length = 32, $raw_output = false)
     {
         // Derived key
         $dk = '';
         // Create key
-        for ($block=1; $block<=$key_length; $block++)
-        {
+        for ($block = 1; $block <= $key_length; ++$block) {
             // Initial hash for this block
             $ib = $h = hash_hmac($a, $salt . pack('N', $block), $password, true);
             // Perform block iterations
-            for ($i=1; $i<$rounds; $i++)
-            {
+            for ($i = 1; $i < $rounds; ++$i) {
                 // XOR each iteration
                 $ib ^= ($h = hash_hmac($a, $h, $password, true));
             }
@@ -904,6 +903,7 @@ protected function hash_pbkdf2($a = 'sha256', $password, $salt, $rounds = 5000,
         }
         // Return derived key of correct length
         $key = substr($dk, 0, $key_length);
+
         return $raw_output ? $key : base64_encode($key);
     }