patternseek / recycle

lib/Recycle.php

Spacing +48 added lines, -48 removed lines

@@ -29,8 +29,8 @@ 
     /**
      * @param $storageDirectory
      */
-    public function __construct( $storageDirectory ){
-        if( $storageDirectory{-1} !== '/' ){
+    public function __construct($storageDirectory) {
+        if ($storageDirectory{-1} !== '/') {
             $storageDirectory .= '/';
         }
         $this->storageDirectory = $storageDirectory;
@@ -43,28 +43,28 @@ 
      * @return string The path that $path was renamed to.
      * @throws \Exception
      */
-    public function moveToBin( $path ){
+    public function moveToBin($path) {
 
-        $path = Path::canonicalize( $path );
+        $path = Path::canonicalize($path);
 
-        $this->pathSafetyCheck( $path );
+        $this->pathSafetyCheck($path);
         
         $date = new \DateTimeImmutable("today");
         $dateStr = $date->format("c");
-        $unique = ( (string) microtime(true) ) .'-'. ( (string) rand(0, 100000 ) );
-        $basename = basename( $path );
+        $unique = ((string) microtime(true)).'-'.((string) rand(0, 100000));
+        $basename = basename($path);
         
-        $todayDir = $this->storageDirectory . $dateStr;
+        $todayDir = $this->storageDirectory.$dateStr;
         $finalRestingPlaceDir = "{$todayDir}/{$unique}";
         $finalRestingPlace = "{$finalRestingPlaceDir}/{$basename}";
 
-        $this->ensureDirUsable( $this->storageDirectory );
-        $this->ensureDirUsable( $todayDir );
-        $this->ensureDirUsable( $finalRestingPlaceDir );
+        $this->ensureDirUsable($this->storageDirectory);
+        $this->ensureDirUsable($todayDir);
+        $this->ensureDirUsable($finalRestingPlaceDir);
         
         // Would use PHP's rename but... it doesn't always work
         // when moving a directory to another device.
-        exec( "mv {$path} {$finalRestingPlace}" );
+        exec("mv {$path} {$finalRestingPlace}");
         return $finalRestingPlace;
     }
 
@@ -73,22 +73,22 @@ 
      * @param $dir
      * @throws \Exception
      */
-    private function ensureDirUsable( $dir )
+    private function ensureDirUsable($dir)
     {
-        if (!file_exists( $dir )) {
-            mkdir( $dir );
-            if (!file_exists( $dir )) {
-                throw new \Exception( "{$dir} does not exist and could not be created." );
+        if (!file_exists($dir)) {
+            mkdir($dir);
+            if (!file_exists($dir)) {
+                throw new \Exception("{$dir} does not exist and could not be created.");
             }
         }
         
-        $this->pathSafetyCheck( $dir );
+        $this->pathSafetyCheck($dir);
         
-        $tmpFilename = tempnam( $dir, "___" );
-        if (!file_exists( $tmpFilename )) {
-            throw new \Exception( "{$dir} does not appear to be writable." );
+        $tmpFilename = tempnam($dir, "___");
+        if (!file_exists($tmpFilename)) {
+            throw new \Exception("{$dir} does not appear to be writable.");
         }
-        unlink( $tmpFilename );
+        unlink($tmpFilename);
     }
 
     /**
@@ -101,17 +101,17 @@ 
      * 
      * @param int $keepDays 1 = today (back to 00:00 from now).
      */
-    public function emptyBin( $keepDays = 1 ){
+    public function emptyBin($keepDays = 1) {
 
-        $items = $this->readDir( $this->storageDirectory );
+        $items = $this->readDir($this->storageDirectory);
         // Items exclude parent directory!
-        $toDelete = $this->generateDeletionList( $keepDays, $items );
+        $toDelete = $this->generateDeletionList($keepDays, $items);
 
-        if( count( $toDelete ) > 0 ){
-            foreach( $toDelete as $itemToDelete){
+        if (count($toDelete) > 0) {
+            foreach ($toDelete as $itemToDelete) {
                 $fullPathToDelete = "{$this->storageDirectory}/{$itemToDelete}";
-                $this->pathSafetyCheck( $fullPathToDelete );
-                exec( "rm -rf {$fullPathToDelete}" );
+                $this->pathSafetyCheck($fullPathToDelete);
+                exec("rm -rf {$fullPathToDelete}");
             }
         }
     }
@@ -123,13 +123,13 @@ 
      * @return array
      * @throws \Exception
      */
-    private function readDir( $directoryPath )
+    private function readDir($directoryPath)
     {
         $ret = [];
-        $this->ensureDirUsable( $directoryPath );
-        $d = dir( $directoryPath );
-        while( false !== ( $entry = $d->read() ) ){
-            if( $entry === '.' || $entry === '..' ){
+        $this->ensureDirUsable($directoryPath);
+        $d = dir($directoryPath);
+        while (false !== ($entry = $d->read())) {
+            if ($entry === '.' || $entry === '..') {
                 continue;
             }
             $ret[] = $entry;
@@ -146,28 +146,28 @@ 
      * @param $items
      * @return array
      */
-    private function generateDeletionList( $keepDays, $items )
+    private function generateDeletionList($keepDays, $items)
     {
         $keepStrings = [];
-        if( $keepDays > 0 ){
-            for( $day = 0; $day < $keepDays; $day++ ){
+        if ($keepDays > 0) {
+            for ($day = 0; $day < $keepDays; $day++) {
                 $dateTmp = new \DateTimeImmutable("today");
-                $dateTmp = $dateTmp->modify( "-{$day} days" );
+                $dateTmp = $dateTmp->modify("-{$day} days");
                 $keepStrings[] = $dateTmp->format("c");
             }
         }
         
         $toDelete = [];
-        foreach( $items as $entry ){
+        foreach ($items as $entry) {
             // In exclusion list?
-            if( in_array( $entry, $keepStrings, true ) ){
+            if (in_array($entry, $keepStrings, true)) {
                 continue;
             }
             // Is a valid ISO 8601 date?
-            if( preg_match(
+            if (preg_match(
                     '/^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/',
                     $entry) 
-            ){
+            ) {
                 $toDelete[] = $entry;
             }
         }
@@ -180,17 +180,17 @@ 
      * @param $path
      * @throws \Exception
      */
-    private function pathSafetyCheck( $path )
+    private function pathSafetyCheck($path)
     {
         // Duplication is intentional for belt-and-braces approach
-        $path = Path::canonicalize( $path );
-        if( ! file_exists( $path ) ){
-            throw new \Exception( "{$path} doesn't exist." );
+        $path = Path::canonicalize($path);
+        if (!file_exists($path)) {
+            throw new \Exception("{$path} doesn't exist.");
         }
-        if( is_dir( $path ) ){
+        if (is_dir($path)) {
             // Path::canonicalize() leaves no trailing slash.
             $path .= '/';
-            if( mb_substr_count( $path, '/', "UTF-8" ) < 3 ){
+            if (mb_substr_count($path, '/', "UTF-8") < 3) {
                 throw new \Exception("Can't use root level directories as recycle area or move or delete them: {$path}");
             }
         }