Merge pull request #52 from jakzal/tools-update

Tools update
jakzal · Feb 19, 2019 · cc79ffc · cc79ffc
2 parents b427c4b + 1fcf989
commit cc79ffc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -130,7 +130,7 @@ tools/php-cs-fixer:
 	curl -Ls http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -o tools/php-cs-fixer && chmod +x tools/php-cs-fixer
 
 tools/deptrac:
-	curl -Ls https://github.com/sensiolabs-de/deptrac/releases/download/0.3.0/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
+	curl -Ls https://github.com/sensiolabs-de/deptrac/releases/download/0.4.0/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
 
 tools/infection: tools/infection.pubkey
 	curl -Ls https://github.com/infection/infection/releases/download/0.10.6/infection.phar -o tools/infection && chmod +x tools/infection
@@ -139,4 +139,4 @@ tools/infection.pubkey:
 	curl -Ls https://github.com/infection/infection/releases/download/0.10.6/infection.phar.pubkey -o tools/infection.pubkey
 
 tools/box:
-	curl -Ls https://github.com/humbug/box/releases/download/3.1.3/box.phar -o tools/box && chmod +x tools/box
+	curl -Ls https://github.com/humbug/box/releases/download/3.4.0/box.phar -o tools/box && chmod +x tools/box
diff --git a/bin/devkit.php b/bin/devkit.php
@@ -141,14 +141,16 @@ function (string $phar) {
                     $project = preg_replace('@https://[^/]*/([^/]*/[^/]*).*@', '$1', $phar);
 
                     return strtr(
-                        '-e "s@\"phar\": \"\([^\"]*%PROJECT%[^\"]*\)\"@\"phar\": \"%PHAR%\"@"',
+                        '-e "s@\"phar\": \"([^\"]*%PROJECT%[^\"]*)\"@\"phar\": \"%PHAR%\"@g"'.
+                        ' '.
+                        '-e "s@\"url\": \"([^\"]*%PROJECT%[^\"]*\.phar(\.asc|\.pubkey))\"@\"url\": \"%PHAR%\\2\"@g"',
                         ['%PROJECT%' => $project, '%PHAR%' => $phar]
                     );
                 },
                 $phars
             ));
 
-            return new ShCommand(sprintf('sed -i.bak %s %s', $replacements, $jsonPath));
+            return new ShCommand(sprintf('sed -i.bak -E %s %s', $replacements, $jsonPath));
         }
     }
 );
@@ -266,4 +268,4 @@ function ($htmls) {
         }
     }
 );
-$application->run();
+$application->run();
diff --git a/resources/tools.json b/resources/tools.json
@@ -161,7 +161,7 @@
       "website": "https://github.com/phan/phan",
       "command": {
         "phar-download": {
-          "phar": "https://github.com/phan/phan/releases/download/1.2.3/phan.phar",
+          "phar": "https://github.com/phan/phan/releases/download/1.2.4/phan.phar",
           "bin": "%target-dir%/phan"
         }
       },
@@ -589,11 +589,11 @@
       "website": "https://getpsalm.org/",
       "command": {
         "file-download": {
-          "url": "https://github.com/vimeo/psalm/releases/download/3.0.16/psalm.phar.asc",
+          "url": "https://github.com/vimeo/psalm/releases/download/3.0.17/psalm.phar.asc",
           "file": "%target-dir%/psalm.phar.asc"
         },
         "phar-download": {
-          "phar": "https://github.com/vimeo/psalm/releases/download/3.0.16/psalm.phar",
+          "phar": "https://github.com/vimeo/psalm/releases/download/3.0.17/psalm.phar",
           "bin": "%target-dir%/psalm"
         }
       },