Added some extensions: tar, gz, bz2

* Added header zone in formatter file
* Updated testing
* Updated README

.formatter.yml

@@ -3,4 +3,15 @@ use-sort:
         - _main
     group-type: each
     sort-type: alph
-    sort-direction: asc
+    sort-direction: asc
+header: |
+    /**
+     * This file is part of the Extractor package.
+     *
+     * For the full copyright and license information, please view the LICENSE
+     * file that was distributed with this source code.
+     *
+     * Feel free to edit as you please, and have fun.
+     *
+     * @author Marc Morera <[email protected]>
+     */

Adapter/TarBz2ExtractorAdapter.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the Extractor package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+namespace Mmoreram\Extractor\Adapter;
+
+use Mmoreram\Extractor\Adapter\Abstracts\AbstractExtractorAdapter;
+use Mmoreram\Extractor\Adapter\Interfaces\ExtractorAdapterInterface;
+use Phar;
+use PharData;
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Class TarBz2ExtractorAdapter
+ */
+class TarBz2ExtractorAdapter extends AbstractExtractorAdapter implements ExtractorAdapterInterface
+{
+    /**
+     * Checks if current adapter can be used
+     *
+     * @return boolean Adapter usable
+     */
+    public function isAvailable()
+    {
+        return 'Bz2';
+    }
+
+    /**
+     * Return the adapter identifier
+     *
+     * @return string Adapter identifier
+     */
+    public function getIdentifier()
+    {
+        return class_exists('\PharData');
+    }
+
+    /**
+     * Extract files from a filepath
+     *
+     * @param string $filePath File path
+     *
+     * @return Finder
+     */
+    public function extract($filePath)
+    {
+        $tmpDirectory = $this->getRandomTemporaryDir();
+        $pharArchive = new PharData($filePath, null, null, Phar::BZ2);
+        $pharArchive->extractTo($tmpDirectory);
+
+        return $this->createFinderFromDirectory($tmpDirectory);
+    }
+}

Adapter/TarExtractorAdapter.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the Extractor package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+namespace Mmoreram\Extractor\Adapter;
+
+use Mmoreram\Extractor\Adapter\Abstracts\AbstractExtractorAdapter;
+use Mmoreram\Extractor\Adapter\Interfaces\ExtractorAdapterInterface;
+use Phar;
+use PharData;
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Class TarExtractorAdapter
+ */
+class TarExtractorAdapter extends AbstractExtractorAdapter implements ExtractorAdapterInterface
+{
+    /**
+     * Checks if current adapter can be used
+     *
+     * @return boolean Adapter usable
+     */
+    public function isAvailable()
+    {
+        return 'Tar';
+    }
+
+    /**
+     * Return the adapter identifier
+     *
+     * @return string Adapter identifier
+     */
+    public function getIdentifier()
+    {
+        return class_exists('\PharData');
+    }
+
+    /**
+     * Extract files from a filepath
+     *
+     * @param string $filePath File path
+     *
+     * @return Finder
+     */
+    public function extract($filePath)
+    {
+        $tmpDirectory = $this->getRandomTemporaryDir();
+        $pharArchive = new PharData($filePath, null, null, Phar::TAR);
+        $pharArchive->extractTo($tmpDirectory);
+
+        return $this->createFinderFromDirectory($tmpDirectory);
+    }
+}

Adapter/TarGzExtractorAdapter.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the Extractor package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+namespace Mmoreram\Extractor\Adapter;
+
+use Mmoreram\Extractor\Adapter\Abstracts\AbstractExtractorAdapter;
+use Mmoreram\Extractor\Adapter\Interfaces\ExtractorAdapterInterface;
+use Phar;
+use PharData;
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Class TarGzExtractorAdapter
+ */
+class TarGzExtractorAdapter extends AbstractExtractorAdapter implements ExtractorAdapterInterface
+{
+    /**
+     * Checks if current adapter can be used
+     *
+     * @return boolean Adapter usable
+     */
+    public function isAvailable()
+    {
+        return 'Gz';
+    }
+
+    /**
+     * Return the adapter identifier
+     *
+     * @return string Adapter identifier
+     */
+    public function getIdentifier()
+    {
+        return class_exists('\PharData');
+    }
+
+    /**
+     * Extract files from a filepath
+     *
+     * @param string $filePath File path
+     *
+     * @return Finder
+     */
+    public function extract($filePath)
+    {
+        $tmpDirectory = $this->getRandomTemporaryDir();
+        $pharArchive = new PharData($filePath, null, null, Phar::GZ);
+        $pharArchive->extractTo($tmpDirectory);
+
+        return $this->createFinderFromDirectory($tmpDirectory);
+    }
+}

Exception/ExtensionNotSupportedException.php

@@ -32,7 +32,7 @@ class ExtensionNotSupportedException extends Exception
      */
     public function __construct($message = "", $code = 0, Exception $previous = null)
     {
-        $message = 'Extension "' . $message . '" is currenly not supported. Extensions supported are [RAR, ZIP, PHAR]';
+        $message = 'Extension "' . $message . '" is currenly not supported. Extensions supported are [RAR, ZIP, PHAR, TAR, GZ, BZ2]';
 
         parent::__construct($message, $code, $previous);
     }

README.md

@@ -68,3 +68,6 @@ works if the php extension is installed.
 * Zip - http://php.net/manual/en/book.zip.php
 * Rar - http://php.net/manual/en/book.rar.php
 * Phar - http://php.net/manual/en/book.phar.php
+* Tar
+* GZ
+* BZ2

Resolver/ExtensionResolver.php

@@ -1,17 +1,14 @@
 <?php
 
 /**
- * This file is part of the Elcodi package.
- *
- * Copyright (c) 2014 Elcodi.com
+ * This file is part of the Extractor package.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * Feel free to edit as you please, and have fun.
  *
  * @author Marc Morera <[email protected]>
- * @author Aldo Chiecchia <[email protected]>
  */
 
 namespace Mmoreram\Extractor\Resolver;
@@ -51,6 +48,18 @@ public function getAdapterNamespaceGivenExtension($fileExtension)
                 $adapterNamespace .= 'PharExtractorAdapter';
                 break;
 
+            case 'tar':
+                $adapterNamespace .= 'TarExtractorAdapter';
+                break;
+
+            case 'gz':
+                $adapterNamespace .= 'TarGzExtractorAdapter';
+                break;
+
+            case 'bz2':
+                $adapterNamespace .= 'TarBz2ExtractorAdapter';
+                break;
+
             default:
                 throw new ExtensionNotSupportedException($fileExtension);
         }

Resolver/Interfaces/ExtensionResolverInterface.php

@@ -1,17 +1,14 @@
 <?php
 
 /**
- * This file is part of the Elcodi package.
- *
- * Copyright (c) 2014 Elcodi.com
+ * This file is part of the Extractor package.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * Feel free to edit as you please, and have fun.
  *
  * @author Marc Morera <[email protected]>
- * @author Aldo Chiecchia <[email protected]>
  */
 
 namespace Mmoreram\Extractor\Resolver\Interfaces;

composer.json

@@ -17,7 +17,8 @@
     "require-dev": {
         "phpunit/phpunit": ">=3.7",
         "fabpot/php-cs-fixer": "~0.1",
-        "mmoreram/php-formatter": "~1.0"
+        "mmoreram/php-formatter": "~1.0",
+        "ext-tar": "*"
     },
     "suggest": {
         "ext-phar": "For usage of Phar adapter",

tests/Adapter/PharExtractorAdapterTest.php

@@ -39,7 +39,7 @@ public function setUp()
     public function testExtract()
     {
         $pharExtractorAdapter = new PharExtractorAdapter();
-        $finder = $pharExtractorAdapter->extract(dirname(__FILE__). '/Fixtures/phar.phar');
+        $finder = $pharExtractorAdapter->extract(dirname(__FILE__). '/Fixtures/file.phar');
 
         $this->assertEquals($finder->count(), 3);
     }

tests/Adapter/RarExtractorAdapterTest.php

@@ -39,7 +39,7 @@ public function setUp()
     public function testExtract()
     {
         $rarExtractorAdapter = new RarExtractorAdapter();
-        $finder = $rarExtractorAdapter->extract(dirname(__FILE__). '/Fixtures/rar.rar');
+        $finder = $rarExtractorAdapter->extract(dirname(__FILE__). '/Fixtures/file.rar');
 
         $this->assertEquals($finder->count(), 3);
     }

tests/Adapter/TarBz2ExtractorAdapterTest.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of the Extractor package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+namespace Extractor\tests\Adapter;
+
+use Mmoreram\Extractor\Adapter\TarBz2ExtractorAdapter;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * Class TarBz2ExtractorAdapterTest
+ */
+class TarBz2ExtractorAdapterTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Setup
+     */
+    public function setUp()
+    {
+        $pharExtractorAdapter = new TarBz2ExtractorAdapter();
+        if (!$pharExtractorAdapter->isAvailable()) {
+
+            $this->markTestSkipped('Phar extension not installed');
+        }
+    }
+
+    /**
+     * Test extract
+     */
+    public function testExtract()
+    {
+        $tarExtractorAdapter = new TarBz2ExtractorAdapter();
+        $finder = $tarExtractorAdapter->extract(dirname(__FILE__). '/Fixtures/file.tar.bz2');
+
+        $this->assertEquals($finder->count(), 3);
+    }
+}