fixes thanks to Nicolas

Author: weaverryan

src/Downloader.php

@@ -29,8 +29,7 @@
 class Downloader
 {
     private const DEFAULT_ENDPOINTS = [
-        // TODO: REVERT THIS
-        'https://raw.githubusercontent.com/weaverryan/recipes/flex/main/index.json',
+        'https://raw.githubusercontent.com/symfony/recipes/flex/main/index.json',
         'https://raw.githubusercontent.com/symfony/recipes-contrib/flex/main/index.json',
     ];
     private const MAX_LENGTH = 1000;
@@ -183,21 +182,15 @@ public function getRecipes(array $operations): array
                         $data['locks'][$package->getName()]['version'] = $version;
                         $data['locks'][$package->getName()]['recipe']['version'] = $v;
 
-                        if (null !== $recipeRef) {
-                            // TODO: add a new archived_recipe_template to _links
-                            $endpointRoot = substr(
-                                $this->endpoints[$endpoint]['_links']['recipe_template'],
-                                0,
-                                strpos($this->endpoints[$endpoint]['_links']['recipe_template'], '{package_dotted}')
-                            );
-                            // TODO: remove - just for testing
-                            $endpointRoot = str_replace('symfony/recipes', 'weaverryan/recipes', $endpointRoot);
-                            $urls[] = sprintf(
-                                '%sarchived/%s/%s.json',
-                                $endpointRoot,
-                                str_replace('/', '.', $package->getName()),
-                                $recipeRef
-                            );
+                        if (null !== $recipeRef && isset($this->endpoints[$endpoint]['_links']['archived_recipes_template'])) {
+                            $url = strtr($this->endpoints[$endpoint]['_links']['archived_recipes_template'], [
+                                '{package_dotted}' => str_replace('/', '.', $package->getName()),
+                                '{ref}' => $recipeRef,
+                            ]);
+
+                            // TODO: remove once symfony/recipes has full history
+                            $url = str_replace('symfony/recipes', 'weaverryan/recipes', $url);
+                            $urls[] = $url;
 
                             break;
                         }

src/Update/RecipePatcher.php

@@ -34,7 +34,7 @@ public function __construct(string $rootDir, IOInterface $io)
     /**
      * Applies the patch. If it fails unexpectedly, an exception will be thrown.
      *
-     * @return bool returns true of fully successful, false if conflicts were encountered
+     * @return bool returns true if fully successful, false if conflicts were encountered
      */
     public function applyPatch(RecipePatch $patch): bool
     {
@@ -198,7 +198,7 @@ private function generateBlobs(array $originalFiles, string $originalFilesRoot):
     {
         $addedBlobs = [];
         foreach ($originalFiles as $filename => $contents) {
-            // if the didn't originally exist, no blob needed
+            // if the file didn't originally exist, no blob needed
             if (!file_exists($originalFilesRoot.'/'.$filename)) {
                 continue;
             }