Minor fixes

raulfraile · Dec 8, 2014 · 1deeb84 · 1deeb84
1 parent ff994b1
commit 1deeb84
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,4 @@ app/config/parameters.ini
 app/config/parameters.yml
 
 # Composer
-composer.phar
+composer.phar
diff --git a/.travis.yml b/.travis.yml
@@ -24,4 +24,4 @@ before_script:
 
 script:
   - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then phpunit --verbose; fi;'
-  - sh -c 'if [ "$TRAVIS_PHP_VERSION" = "hhvm-nightly" ]; then hhvm -c travis.hhvm.ini ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit; fi;'
+  - sh -c 'if [ "$TRAVIS_PHP_VERSION" = "hhvm-nightly" ]; then hhvm -c travis.hhvm.ini ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit; fi;'
diff --git a/examples/format_chooser.php b/examples/format_chooser.php
@@ -23,4 +23,4 @@
     ->addFilesWithDifferentExtensions('http://get.symfony.com/Symfony_Standard_Vendors_2.5.3', ['zip', 'tgz'])
     ->getPreferredFile();
 
-echo $preferredFile . \PHP_EOL;
+echo $preferredFile . \PHP_EOL;
diff --git a/src/Extractor/Util/ProcessExecutor.php b/src/Extractor/Util/ProcessExecutor.php
@@ -106,4 +106,4 @@ public static function escape($argument)
     {
         return ProcessUtils::escapeArgument($argument);
     }
-}
+}
diff --git a/src/Method/Extension/PharData.php b/src/Method/Extension/PharData.php
@@ -30,8 +30,7 @@ public function extract($file, $target, Format\FormatInterface $format)
         $this->checkSupport($format);
 
         try {
-            $pharFormat = $this->getPharFormat($format);
-            $archive = new \PharData($file/*, null, null, $pharFormat*/);
+            $archive = new \PharData($file);
             $archive->extractTo($target, null, true);
         } catch (\Exception $e) {
             return false;
@@ -40,21 +39,6 @@ public function extract($file, $target, Format\FormatInterface $format)
         return true;
     }
 
-    /**
-     * Gets the format of the phar file.
-     * @param FormatInterface $format
-     *
-     * @return int|null
-     */
-    protected function getPharFormat(Format\FormatInterface $format)
-    {
-        if ($format instanceof Format\Tar || $format instanceof Format\TarBz2 || $format instanceof Format\TarGz) {
-            return \Phar::TAR;
-        }
-
-        return null;
-    }
-
     /**
      * {@inheritdoc}
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,4 +106,4 @@ public static function escape($argument) @@
         {
             return ProcessUtils::escapeArgument($argument);
         }
-    }
+    }