symfony · petarmarj · Aug 29, 2022 · Aug 29, 2022 · petarmarj · Aug 29, 2022
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -490,6 +490,11 @@ public function makePathRelative(string $endPath, string $startPath): string
        // Construct $endPath from traversing to the common path, then to the remaining $endPath
        $relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');

+        // Remove ending "/" if $endPath points to existing file
+        if (file_exists($endPath) && !is_dir($endPath) && str_ends_with($relativePath, '/')) {
+            $relativePath = rtrim($relativePath, '/');
+        }
+
        return '' === $relativePath ? './' : $relativePath;
    }

@@ -669,7 +674,6 @@ public function dumpFile(string $filename, $content)
     * Appends content to an existing file.
     *
     * @param string|resource $content The content to append
-     * @param bool            $lock    Whether the file should be locked when writing to it
     *
     * @throws IOException If the file is not writable
     */
-Original file line number
+Diff line change
@@ -490,6 +490,11 @@ public function makePathRelative(string $endPath, string $startPath): string
             // Construct $endPath from traversing to the common path, then to the remaining $endPath
             $relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');
+            // Remove ending "/" if $endPath points to existing file
+            if (file_exists($endPath) && !is_dir($endPath) && str_ends_with($relativePath, '/')) {
+                $relativePath = rtrim($relativePath, '/');
+            }
             return '' === $relativePath ? './' : $relativePath;
         }
@@ -669,7 +674,6 @@ public function dumpFile(string $filename, $content)
          * Appends content to an existing file.
          *
          * @param string|resource $content The content to append
-         * @param bool            $lock    Whether the file should be locked when writing to it
             Copy link

  
      
    
  

  
      



      

  Author


  

  
    
      

      
            petarmarj
  

      

      

      


        Aug 29, 2022


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Removed by phpcs with Symfony standard.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
          *
          * @throws IOException If the file is not writable
          */
-          Expand Down