Merge pull request vimeo#6267 from weirdan/fix-phar-tag-name

Strip `refs/tags/` as well
VincentLanglet · Aug 9, 2021 · 8fdd0df · 8fdd0df
2 parents 3fb9e1c + 79b8630
commit 8fdd0df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/bin/github-deploy-phar.sh b/bin/github-deploy-phar.sh
@@ -26,6 +26,7 @@ git commit -m "Updated Psalm phar to commit ${GITHUB_SHA}"
 git push origin master
 
 tag=${GITHUB_REF/refs\/heads\//}
+tag=${tag/refs\/tags\//}
 
 if [[ "$tag" != 'master' ]] ; then
     git tag "$tag"

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ConstFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ConstFetchAnalyzer.php
@@ -137,14 +137,16 @@ public static function getGlobalConstType(
                 case 'PHP_VERSION':
                 case 'DIRECTORY_SEPARATOR':
                 case 'PATH_SEPARATOR':
+                case 'PHP_EOL':
+                    return Type::getNonEmptyString();
+
                 case 'PEAR_EXTENSION_DIR':
                 case 'PEAR_INSTALL_DIR':
                 case 'PHP_BINARY':
                 case 'PHP_BINDIR':
                 case 'PHP_CONFIG_FILE_PATH':
                 case 'PHP_CONFIG_FILE_SCAN_DIR':
                 case 'PHP_DATADIR':
-                case 'PHP_EOL':
                 case 'PHP_EXTENSION_DIR':
                 case 'PHP_EXTRA_VERSION':
                 case 'PHP_LIBDIR':