Merge remote-tracking branch 'upstream/master'

CONTRIBUTING.md

@@ -1,16 +1,19 @@
 # Contribution process
 Thank you, your help is most appreciated, and improves experience for everyone!
-Please follow the guidelines to keep it simpler for both sides.
+Please follow the guidelines to keep it simpler for both sides. Contact us if unsure or in case if you *have* to massively violate these guidelines)
 
 # Notes on content
-Please link pull request/commit messages to [YT] issue and back if such issue exists.
+Please link pull request/commit messages to [issue tracker] and back if corresponding issue exists.
 
-##Code Style
+## Code Style
 * Please avoid any unnecessary changes eg. spacing, line endings, HTML formatting. Remember, these files are NOT for human consumption. We want to preserve meaningful history.
 * Please try to match existing style for any particular file - formatting, spacing, naming conventions.
 * Please add corresponding @since tags
 
-##Types of contribution
-We don't really want to include all possible extension/libs ASAP (they do slow the IDE down a bit) and we are working on a better system for managing them. **Until we find good solution we'll prioritise bugfixes**.
+## Types of contribution
+As of 2017.1 Preview we gladly accept all "non-statdard" extenstions and IDE get a UI for per-project configuration.
+As of 2016.3 there is an [easy way to package your custom stubs/metadata] as an plugin.
 
-[YT]:https://youtrack.jetbrains.com/issues/WI?q=%23Unresolved+%23%7BPHP+lib+stubs%7D+
+
+[issue tracker]:https://youtrack.jetbrains.com/issues/WI?q=%23Unresolved+%23%7BPHP+lib+stubs%7D+
+[easy way to package your custom stubs/metadata]:https://github.com/artspb/phpstorm-library-plugin

Core.php → Core/Core.php

@@ -135,7 +135,7 @@ function strncasecmp ($str1, $str2, $len) {}
 /**
  * Return the current key and value pair from an array and advance the array cursor
  * @link http://php.net/manual/en/function.each.php
- * @param array $array <p>
+ * @param array|ArrayObject $array <p>
  * The input array.
  * </p>
  * @return array the current key and value pair from the array
@@ -1053,3 +1053,47 @@ function gc_enable () {}
  * @since 5.3.0
  */
 function gc_disable () {}
+
+/**
+ * @param string $kind
+ * @return int
+ * @since 7.1
+ */
+function sapi_windows_cp_get($kind) {
+
+}
+
+/**
+ * @param int $cp
+ * @return bool
+ * @since 7.1
+ */
+function sapi_windows_cp_set($cp) {
+
+}
+
+/**
+ * @param int|string $in_codepage
+ * @param int|string $out_codepage
+ * @param string $subject
+ * @return string
+ * @since 7.1
+ */
+function sapi_windows_cp_conv($in_codepage, $out_codepage, $subject) {}
+
+/**
+ * @return bool
+ * @since 7.1
+ */
+function sapi_windows_cp_is_utf8() {
+
+}
+
+/**
+ * true if a value is iterable and will be accepted by the iterable pseudo-type, false for other values.
+ * @param mixed $value
+ * @return true
+ * @since 7.1
+ * @link https://wiki.php.net/rfc/iterable
+ */
+function is_iterable($value) {}

Core_c.php → Core/Core_c.php

@@ -9,11 +9,16 @@
 class stdClass {
 }
 
+/**
+ * @link https://wiki.php.net/rfc/iterable
+ */
+interface iterable {}
+
 /**
  * Interface to detect if a class is traversable using &foreach;.
  * @link http://php.net/manual/en/class.traversable.php
  */
-interface Traversable {
+interface Traversable extends iterable {
 }
 
 /**
@@ -271,10 +276,10 @@ final private function __clone() { }
      * @link http://php.net/manual/en/exception.construct.php
      * @param string $message [optional] The Exception message to throw.
      * @param int $code [optional] The Exception code.
-     * @param Exception $previous [optional] The previous exception used for the exception chaining. Since 5.3.0
+     * @param Throwable $previous [optional] The previous throwable used for the exception chaining.
      * @since 5.1.0
      */
-    public function __construct($message = "", $code = 0, Exception $previous = null) { }
+    public function __construct($message = "", $code = 0, Throwable $previous = null) { }
 
     /**
      * Gets the Exception message
@@ -582,5 +587,11 @@ static function bind(Closure $closure, $newthis, $newscope = 'static') { }
      * @since 7.0
      */
     function call ($newThis, ...$parameters) {}
-
+
+    /**
+     * @param callable $callable
+     * @return Closure
+     * @since 7.1
+     */
+    public static function fromCallable (callable $callable) {}
 }

Core_d.php → Core/Core_d.php

@@ -353,3 +353,6 @@
 define('STDIN', fopen('php://stdin', 'r'));
 define('STDOUT', fopen('php://stdout', 'w'));
 define('STDERR', fopen('php://stderr', 'w'));
+
+define('PHP_FD_SETSIZE', 1024);
+