Merge branch 'master' into explicit-symlink-resolution

vimeo · Dec 22, 2021 · daaa74c · daaa74c
2 parents 1da6893 + f2db139
commit daaa74c
Show file tree

Hide file tree

Showing 1,189 changed files with 6,488 additions and 3,412 deletions.
diff --git a/composer.json b/composer.json
@@ -60,6 +60,10 @@
         "ext-curl": "In order to send data to shepherd"
     },
     "config": {
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true,
+            "composer/package-versions-deprecated": true
+        },
         "optimize-autoloader": true,
         "sort-packages": true,
         "platform-check": false

diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -6824,7 +6824,7 @@
 'ldap_sasl_bind' => ['bool', 'ldap'=>'LDAP\Connection', 'dn='=>'string', 'password='=>'string', 'mech='=>'string', 'realm='=>'string', 'authc_id='=>'string', 'authz_id='=>'string', 'props='=>'string'],
 'ldap_search' => ['LDAP\Connection|false', 'ldap'=>'LDAP\Connection|LDAP\Connection[]', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int'],
 'ldap_set_option' => ['bool', 'ldap'=>'LDAP\Connection|null', 'option'=>'int', 'value'=>'mixed'],
-'ldap_set_rebind_proc' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'string'],
+'ldap_set_rebind_proc' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'?callable'],
 'ldap_start_tls' => ['bool', 'ldap'=>'resource'],
 'ldap_t61_to_8859' => ['string', 'value'=>'string'],
 'ldap_unbind' => ['bool', 'ldap'=>'resource'],
@@ -8393,7 +8393,7 @@
 'mysqli::__construct' => ['void', 'hostname='=>'string|null', 'username='=>'string|null', 'password='=>'string|null', 'database='=>'string|null', 'port='=>'int|null', 'socket='=>'string|null'],
 'mysqli::autocommit' => ['bool', 'enable'=>'bool'],
 'mysqli::begin_transaction' => ['bool', 'flags='=>'int', 'name='=>'?string'],
-'mysqli::change_user' => ['bool', 'username'=>'string', 'password'=>'string', 'database'=>'string'],
+'mysqli::change_user' => ['bool', 'username'=>'string', 'password'=>'string', 'database'=>'?string'],
 'mysqli::character_set_name' => ['string'],
 'mysqli::close' => ['bool'],
 'mysqli::commit' => ['bool', 'flags='=>'int', 'name='=>'?string'],
@@ -8431,7 +8431,7 @@
 'mysqli::set_local_infile_default' => ['void'],
 'mysqli::set_local_infile_handler' => ['bool', 'read_func='=>'callable'],
 'mysqli::set_opt' => ['bool', 'option'=>'int', 'value'=>'string|int'],
-'mysqli::ssl_set' => ['bool', 'key'=>'string', 'certificate'=>'string', 'ca_certificate'=>'string', 'ca_path'=>'string', 'cipher_algos'=>'string'],
+'mysqli::ssl_set' => ['bool', 'key'=>'?string', 'certificate'=>'?string', 'ca_certificate'=>'?string', 'ca_path'=>'?string', 'cipher_algos'=>'?string'],
 'mysqli::stat' => ['string|false'],
 'mysqli::stmt_init' => ['mysqli_stmt'],
 'mysqli::store_result' => ['mysqli_result|false', 'mode='=>'int'],
@@ -8483,7 +8483,7 @@
 'mysqli_free_result' => ['void', 'result'=>'mysqli_result'],
 'mysqli_get_cache_stats' => ['array|false'],
 'mysqli_get_charset' => ['object', 'mysql'=>'mysqli'],
-'mysqli_get_client_info' => ['string', 'mysql'=>'mysqli'],
+'mysqli_get_client_info' => ['string', 'mysql='=>'?mysqli'],
 'mysqli_get_client_stats' => ['array'],
 'mysqli_get_client_version' => ['int', 'link'=>'mysqli'],
 'mysqli_get_connection_stats' => ['array', 'mysql'=>'mysqli'],
@@ -8549,7 +8549,7 @@
 'mysqli_set_opt' => ['bool', 'mysql'=>'mysqli', 'option'=>'int', 'value'=>'string|int'],
 'mysqli_slave_query' => ['bool', 'link'=>'mysqli', 'query'=>'string'],
 'mysqli_sqlstate' => ['string', 'mysql'=>'mysqli'],
-'mysqli_ssl_set' => ['bool', 'mysql'=>'mysqli', 'key'=>'string', 'certificate'=>'string', 'ca_certificate'=>'string', 'ca_path'=>'string', 'cipher_algos'=>'string'],
+'mysqli_ssl_set' => ['bool', 'mysql'=>'mysqli', 'key'=>'?string', 'certificate'=>'?string', 'ca_certificate'=>'?string', 'ca_path'=>'?string', 'cipher_algos'=>'?string'],
 'mysqli_stat' => ['string|false', 'mysql'=>'mysqli'],
 'mysqli_stmt::__construct' => ['void', 'mysql'=>'mysqli', 'query'=>'string'],
 'mysqli_stmt::attr_get' => ['int', 'attribute'=>'int'],
@@ -9025,8 +9025,7 @@
 'nsapi_response_headers' => ['array'],
 'nsapi_virtual' => ['bool', 'uri'=>'string'],
 'nthmac' => ['string', 'clent'=>'string', 'data'=>'string'],
-'number_format' => ['string', 'num'=>'float|int', 'decimals='=>'int'],
-'number_format\'1' => ['string', 'num'=>'float|int', 'decimals'=>'int', 'decimal_separator'=>'string', 'thousands_separator'=>'string'],
+'number_format' => ['string', 'num'=>'float|int', 'decimals='=>'int', 'decimal_separator='=>'string', 'thousands_separator='=>'string'],
 'NumberFormatter::__construct' => ['void', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'],
 'NumberFormatter::create' => ['NumberFormatter|false', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'],
 'NumberFormatter::format' => ['string|false', 'num'=>'', 'type='=>'int'],
@@ -11460,6 +11459,7 @@
 'ReflectionFunctionAbstract::isDeprecated' => ['bool'],
 'ReflectionFunctionAbstract::isGenerator' => ['bool'],
 'ReflectionFunctionAbstract::isInternal' => ['bool'],
+'ReflectionFunctionAbstract::isStatic' => ['bool'],
 'ReflectionFunctionAbstract::isUserDefined' => ['bool'],
 'ReflectionFunctionAbstract::isVariadic' => ['bool'],
 'ReflectionFunctionAbstract::returnsReference' => ['bool'],
@@ -11509,7 +11509,6 @@
 'ReflectionMethod::isPrivate' => ['bool'],
 'ReflectionMethod::isProtected' => ['bool'],
 'ReflectionMethod::isPublic' => ['bool'],
-'ReflectionMethod::isStatic' => ['bool'],
 'ReflectionMethod::isUserDefined' => ['bool'],
 'ReflectionMethod::isVariadic' => ['bool'],
 'ReflectionMethod::returnsReference' => ['bool'],
@@ -12244,19 +12243,19 @@
 'SoapClient::__construct' => ['void', 'wsdl'=>'mixed', 'options='=>'array|null'],
 'SoapClient::__doRequest' => ['?string', 'request'=>'string', 'location'=>'string', 'action'=>'string', 'version'=>'int', 'one_way='=>'bool'],
 'SoapClient::__getCookies' => ['array'],
-'SoapClient::__getFunctions' => ['array'],
-'SoapClient::__getLastRequest' => ['string'],
-'SoapClient::__getLastRequestHeaders' => ['string'],
-'SoapClient::__getLastResponse' => ['string'],
-'SoapClient::__getLastResponseHeaders' => ['string'],
-'SoapClient::__getTypes' => ['array'],
+'SoapClient::__getFunctions' => ['?array'],
+'SoapClient::__getLastRequest' => ['?string'],
+'SoapClient::__getLastRequestHeaders' => ['?string'],
+'SoapClient::__getLastResponse' => ['?string'],
+'SoapClient::__getLastResponseHeaders' => ['?string'],
+'SoapClient::__getTypes' => ['?array'],
 'SoapClient::__setCookie' => ['', 'name'=>'string', 'value='=>'string'],
 'SoapClient::__setLocation' => ['string', 'new_location='=>'string'],
 'SoapClient::__setSoapHeaders' => ['bool', 'soapheaders='=>''],
 'SoapClient::__soapCall' => ['', 'function_name'=>'string', 'arguments'=>'array', 'options='=>'array', 'input_headers='=>'SoapHeader|array', '&w_output_headers='=>'array'],
 'SoapClient::SoapClient' => ['object', 'wsdl'=>'mixed', 'options='=>'array|null'],
 'SoapFault::__clone' => ['void'],
-'SoapFault::__construct' => ['void', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+'SoapFault::__construct' => ['void', 'code'=>'array|string|null', 'string'=>'string', 'actor='=>'?string', 'details='=>'?mixed', 'name='=>'?string', 'headerFault='=>'?mixed'],
 'SoapFault::__toString' => ['string'],
 'SoapFault::__wakeup' => ['void'],
 'SoapFault::getCode' => ['int'],
@@ -12266,7 +12265,7 @@
 'SoapFault::getPrevious' => ['?Exception|?Throwable'],
 'SoapFault::getTrace' => ['list<array<string,mixed>>'],
 'SoapFault::getTraceAsString' => ['string'],
-'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'?string', 'detail='=>'?mixed', 'faultname='=>'?string', 'headerfault='=>'?mixed'],
 'SoapHeader::__construct' => ['void', 'namespace'=>'string', 'name'=>'string', 'data='=>'mixed', 'mustunderstand='=>'bool', 'actor='=>'string'],
 'SoapHeader::SoapHeader' => ['object', 'namespace'=>'string', 'name'=>'string', 'data='=>'mixed', 'mustunderstand='=>'bool', 'actor='=>'string'],
 'SoapParam::__construct' => ['void', 'data'=>'mixed', 'name'=>'string'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -713,6 +713,10 @@
       'old' => ['bool|string', 'ldap'=>'resource', 'user='=>'string', 'old_password='=>'string', 'new_password='=>'string', '&w_controls='=>'array'],
       'new' => ['bool|string', 'ldap'=>'resource', 'user='=>'string', 'old_password='=>'string', 'new_password='=>'string', '&w_controls='=>'array|null'],
     ],
+    'ldap_set_rebind_proc' => [
+      'old' => ['bool', 'ldap'=>'resource', 'callback'=>'callable'],
+      'new' => ['bool', 'ldap'=>'resource', 'callback'=>'?callable'],
+    ],
     'mb_check_encoding' => [
       'old' => ['bool', 'value='=>'array|string', 'encoding='=>'string'],
       'new' => ['bool', 'value='=>'array|string|null', 'encoding='=>'string|null'],
@@ -949,6 +953,10 @@
       'old' => ['bool', 'mysql'=>'mysqli', 'flags='=>'int', 'name='=>'string'],
       'new' => ['bool', 'mysql'=>'mysqli', 'flags='=>'int', 'name='=>'?string'],
     ],
+    'number_format' => [
+      'old' => ['string', 'num'=>'float|int', 'decimals='=>'int'],
+      'new' => ['string', 'num'=>'float|int', 'decimals='=>'int', 'decimal_separator='=>'string', 'thousands_separator='=>'string'],
+    ],
     'openssl_csr_export' => [
       'old' => ['bool', 'csr'=>'string|resource', '&w_output'=>'string', 'no_text='=>'bool'],
       'new' => ['bool', 'csr'=>'OpenSSLCertificateSigningRequest|string', '&w_output'=>'OpenSSLAsymmetricKey', 'no_text='=>'bool'],
@@ -1591,6 +1599,7 @@
     'image2wbmp' => ['bool', 'im'=>'resource', 'filename='=>'?string', 'threshold='=>'int'],
     'jpeg2wbmp' => ['bool', 'jpegname'=>'string', 'wbmpname'=>'string', 'dest_height'=>'int', 'dest_width'=>'int', 'threshold'=>'int'],
     'ldap_sort' => ['bool', 'link_identifier'=>'resource', 'result_identifier'=>'resource', 'sortfilter'=>'string'],
+    'number_format\'1' => ['string', 'num'=>'float|int', 'decimals'=>'int', 'decimal_separator'=>'string', 'thousands_separator'=>'string'],
     'png2wbmp' => ['bool', 'pngname'=>'string', 'wbmpname'=>'string', 'dest_height'=>'int', 'dest_width'=>'int', 'threshold'=>'int'],
     'read_exif_data' => ['array', 'filename'=>'string', 'sections_needed='=>'string', 'sub_arrays='=>'bool', 'read_thumbnail='=>'bool'],
     'SimpleXMLIterator::rewind' => ['void'],

diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php
@@ -45,6 +45,7 @@
     'ReflectionEnumUnitCase::getEnum' => ['ReflectionEnum'],
     'ReflectionEnumUnitCase::getValue' => ['UnitEnum'],
     'ReflectionEnumBackedCase::getBackingValue' => ['string|int'],
+    'ReflectionFunctionAbstract::isStatic' => ['bool'],
   ],
 
   'changed' => [
@@ -633,8 +634,8 @@
       'new' => ['bool', 'ldap'=>'LDAP\Connection|null', 'option'=>'int', 'value'=>'mixed'],
     ],
     'ldap_set_rebind_proc' => [
-      'old' => ['bool', 'ldap'=>'resource', 'callback'=>'string'],
-      'new' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'string'],
+      'old' => ['bool', 'ldap'=>'resource', 'callback'=>'?callable'],
+      'new' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'?callable'],
     ],
     'mysqli::connect' => [
       'old' => ['null|false', 'hostname='=>'string|null', 'username='=>'string|null', 'password='=>'string|null', 'database='=>'string|null', 'port='=>'int|null', 'socket='=>'string|null'],
@@ -1106,5 +1107,7 @@
     ],
   ],
 
-  'removed' => [],
+  'removed' => [
+    'ReflectionMethod::isStatic' => ['bool'],
+  ],
 ];
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -6823,19 +6823,19 @@
     'SoapClient::__construct' => ['void', 'wsdl'=>'mixed', 'options='=>'array|null'],
     'SoapClient::__doRequest' => ['?string', 'request'=>'string', 'location'=>'string', 'action'=>'string', 'version'=>'int', 'one_way='=>'int'],
     'SoapClient::__getCookies' => ['array'],
-    'SoapClient::__getFunctions' => ['array'],
-    'SoapClient::__getLastRequest' => ['string'],
-    'SoapClient::__getLastRequestHeaders' => ['string'],
-    'SoapClient::__getLastResponse' => ['string'],
-    'SoapClient::__getLastResponseHeaders' => ['string'],
-    'SoapClient::__getTypes' => ['array'],
+    'SoapClient::__getFunctions' => ['?array'],
+    'SoapClient::__getLastRequest' => ['?string'],
+    'SoapClient::__getLastRequestHeaders' => ['?string'],
+    'SoapClient::__getLastResponse' => ['?string'],
+    'SoapClient::__getLastResponseHeaders' => ['?string'],
+    'SoapClient::__getTypes' => ['?array'],
     'SoapClient::__setCookie' => ['', 'name'=>'string', 'value='=>'string'],
     'SoapClient::__setLocation' => ['string', 'new_location='=>'string'],
     'SoapClient::__setSoapHeaders' => ['bool', 'soapheaders='=>''],
     'SoapClient::__soapCall' => ['', 'function_name'=>'string', 'arguments'=>'array', 'options='=>'array', 'input_headers='=>'SoapHeader|array', '&w_output_headers='=>'array'],
-    'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+    'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'?string', 'detail='=>'?mixed', 'faultname='=>'?string', 'headerfault='=>'?mixed'],
     'SoapFault::__clone' => ['void'],
-    'SoapFault::__construct' => ['void', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+    'SoapFault::__construct' => ['void', 'code'=>'array|string|null', 'string'=>'string', 'actor='=>'?string', 'details='=>'?mixed', 'name='=>'?string', 'headerFault='=>'?mixed'],
     'SoapFault::__toString' => ['string'],
     'SoapFault::__wakeup' => ['void'],
     'SoapFault::getCode' => ['int'],
@@ -12525,7 +12525,7 @@
     'ldap_sasl_bind' => ['bool', 'ldap'=>'resource', 'dn='=>'string', 'password='=>'string', 'mech='=>'string', 'realm='=>'string', 'authc_id='=>'string', 'authz_id='=>'string', 'props='=>'string'],
     'ldap_search' => ['resource|false', 'ldap'=>'resource|resource[]', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int'],
     'ldap_set_option' => ['bool', 'ldap'=>'resource|null', 'option'=>'int', 'value'=>'mixed'],
-    'ldap_set_rebind_proc' => ['bool', 'ldap'=>'resource', 'callback'=>'string'],
+    'ldap_set_rebind_proc' => ['bool', 'ldap'=>'resource', 'callback'=>'callable'],
     'ldap_sort' => ['bool', 'link_identifier'=>'resource', 'result_identifier'=>'resource', 'sortfilter'=>'string'],
     'ldap_start_tls' => ['bool', 'ldap'=>'resource'],
     'ldap_t61_to_8859' => ['string', 'value'=>'string'],
@@ -13329,7 +13329,7 @@
     'mysqli::__construct' => ['void', 'hostname='=>'string', 'username='=>'string', 'password='=>'string', 'database='=>'string', 'port='=>'int', 'socket='=>'string'],
     'mysqli::autocommit' => ['bool', 'enable'=>'bool'],
     'mysqli::begin_transaction' => ['bool', 'flags='=>'int', 'name='=>'string'],
-    'mysqli::change_user' => ['bool', 'username'=>'string', 'password'=>'string', 'database'=>'string'],
+    'mysqli::change_user' => ['bool', 'username'=>'string', 'password'=>'string', 'database'=>'?string'],
     'mysqli::character_set_name' => ['string'],
     'mysqli::close' => ['bool'],
     'mysqli::commit' => ['bool', 'flags='=>'int', 'name='=>'string'],
@@ -13367,7 +13367,7 @@
     'mysqli::set_local_infile_default' => ['void'],
     'mysqli::set_local_infile_handler' => ['bool', 'read_func='=>'callable'],
     'mysqli::set_opt' => ['bool', 'option'=>'int', 'value'=>'string|int'],
-    'mysqli::ssl_set' => ['bool', 'key'=>'string', 'certificate'=>'string', 'ca_certificate'=>'string', 'ca_path'=>'string', 'cipher_algos'=>'string'],
+    'mysqli::ssl_set' => ['bool', 'key'=>'?string', 'certificate'=>'?string', 'ca_certificate'=>'?string', 'ca_path'=>'?string', 'cipher_algos'=>'?string'],
     'mysqli::stat' => ['string|false'],
     'mysqli::stmt_init' => ['mysqli_stmt'],
     'mysqli::store_result' => ['mysqli_result|false', 'mode='=>'int'],
@@ -13418,7 +13418,7 @@
     'mysqli_free_result' => ['void', 'result'=>'mysqli_result'],
     'mysqli_get_cache_stats' => ['array|false'],
     'mysqli_get_charset' => ['object', 'mysql'=>'mysqli'],
-    'mysqli_get_client_info' => ['string', 'mysql'=>'mysqli'],
+    'mysqli_get_client_info' => ['string', 'mysql='=>'?mysqli'],
     'mysqli_get_client_stats' => ['array'],
     'mysqli_get_client_version' => ['int', 'link'=>'mysqli'],
     'mysqli_get_connection_stats' => ['array', 'mysql'=>'mysqli'],
@@ -13483,7 +13483,7 @@
     'mysqli_set_opt' => ['bool', 'mysql'=>'mysqli', 'option'=>'int', 'value'=>'string|int'],
     'mysqli_slave_query' => ['bool', 'link'=>'mysqli', 'query'=>'string'],
     'mysqli_sqlstate' => ['string', 'mysql'=>'mysqli'],
-    'mysqli_ssl_set' => ['bool', 'mysql'=>'mysqli', 'key'=>'string', 'certificate'=>'string', 'ca_certificate'=>'string', 'ca_path'=>'string', 'cipher_algos'=>'string'],
+    'mysqli_ssl_set' => ['bool', 'mysql'=>'mysqli', 'key'=>'?string', 'certificate'=>'?string', 'ca_certificate'=>'?string', 'ca_path'=>'?string', 'cipher_algos'=>'?string'],
     'mysqli_stat' => ['string|false', 'mysql'=>'mysqli'],
     'mysqli_stmt::__construct' => ['void', 'mysql'=>'mysqli', 'query'=>'string'],
     'mysqli_stmt::attr_get' => ['int', 'attribute'=>'int'],

diff --git a/dictionaries/InternalTaintSinkMap.php b/dictionaries/InternalTaintSinkMap.php
@@ -1,9 +1,11 @@
 <?php
 
+use Psalm\Type\TaintKind;
+
 // This maps internal function names to sink types that we don’t want to end up there
 
 /**
- * @var array<string, list<list<Type\TaintKind::*>>>
+ * @var array<string, list<list<TaintKind::*>>>
  */
 return [
 'exec' => [['shell']],

diff --git a/dictionaries/PropertyMap.php b/dictionaries/PropertyMap.php
@@ -527,11 +527,12 @@
         'headers' => 'array<string, string>|null',
     ],
     'soapfault' => [
-        'faultcode' => 'string',
+        'faultcode' => 'string|null',
+        'faultcodens' => 'string|null',
         'faultstring' => 'string',
-        'faultactor' => 'string',
-        'detail' => 'string',
+        'faultactor' => 'string|null',
+        'detail' => 'mixed|null',
         '_name' => 'string',
-        'headerfault' => 'string',
+        'headerfault' => 'mixed|null',
     ],
 ];
diff --git a/docs/running_psalm/issues/DeprecatedConstant.md b/docs/running_psalm/issues/DeprecatedConstant.md
@@ -1,6 +1,6 @@
 # DeprecatedConstant
 
-Emitted when referring to a deprecated constant:
+Emitted when referring to a deprecated constant or enum case:
 
 ```php
 <?php
@@ -11,6 +11,13 @@ class A {
 }
 
 echo A::FOO;
+
+enum B {
+    /** @deprecated */
+    case B;
+}
+
+echo B::B;
 ```
 
 ## Why this is bad
@@ -19,4 +26,4 @@ The `@deprecated` tag is normally indicative of code that will stop working in t
 
 ## How to fix
 
-Don’t use the deprecated constant.
+Don’t use the deprecated constant or enum case
diff --git a/docs/running_psalm/issues/UnresolvableInclude.md b/docs/running_psalm/issues/UnresolvableInclude.md
@@ -6,6 +6,6 @@ Emitted when Psalm cannot figure out what specific file is being included/requir
 <?php
 
 function requireFile(string $s) : void {
-    require_once($s);
+    require_once $s;
 }
 ```