Move Countable to predefined interfaces out from SPL (#1664)

It has been part of core since 7.2, so let's stop lying.

Author: Girgias

reference/spl/countable.xml renamed to language/predefined/countable.xml

@@ -37,7 +37,7 @@
 
  </partintro>
 
- &reference.spl.entities.countable;
+ &language.predefined.countable.count;
 
 </reference>
 <!-- Keep this comment at the end of the file

reference/spl/countable/count.xml renamed to language/predefined/countable/count.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="countable.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="countable.count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Countable::count</refname>
   <refpurpose>Count elements of an object</refpurpose>
@@ -12,10 +12,11 @@
    <modifier>public</modifier> <type>int</type><methodname>Countable::count</methodname>
    <void/>
   </methodsynopsis>
-  <para>
-   This method is executed when using the <function>count</function> function on an
-   object implementing <classname>Countable</classname>.
-  </para>
+  <simpara>
+   This method is executed when the <parameter>value</parameter> for
+   <function>count</function> is an object implementing
+   <classname>Countable</classname>.
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,41 +26,36 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    The custom count as an <type>int</type>.
-  </para>
-  <note>
-   <para>
-    The return value is cast to an <type>int</type>.
-   </para>
-  </note>
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">
   &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Countable::count</function> example</title>
-    <programlisting role="php">
+  <example>
+   <title><function>Countable::count</function> example</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
-class myCounter implements Countable {
+class Counter implements Countable {
     private $count = 0;
+
     public function count() {
         return ++$this->count;
     }
 }
 
 $counter = new myCounter;
 
-for($i=0; $i<10; ++$i) {
+for ($i = 0; $i < 10; ++$i) {
     echo "I have been count()ed " . count($counter) . " times\n";
 }
 ?>
 ]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
+   </programlisting>
+   &example.outputs.similar;
+   <screen>
 <![CDATA[
 I have been count()ed 1 times
 I have been count()ed 2 times
@@ -72,9 +68,8 @@ I have been count()ed 8 times
 I have been count()ed 9 times
 I have been count()ed 10 times
 ]]>
-    </screen>
-   </example>
-  </para>
+   </screen>
+  </example>
  </refsect1>
 
 </refentry>

language/predefined/interfaces.xml

@@ -16,6 +16,7 @@
  &language.predefined.iteratoraggregate;
  &language.predefined.internaliterator;
  &language.predefined.throwable;
+ &language.predefined.countable;
  &language.predefined.arrayaccess;
  &language.predefined.serializable;
  &language.predefined.closure;

reference/spl/interfaces.xml

@@ -11,7 +11,6 @@
   <section xml:id="spl.interfaces.list">
    &spl.interfaces.list;
    <simplelist>
-    <member><classname>Countable</classname></member>
     <member><classname>OuterIterator</classname></member>
     <member><classname>RecursiveIterator</classname></member>
     <member><classname>SeekableIterator</classname></member>
@@ -22,7 +21,6 @@
 
  </partintro>
 
- &reference.spl.countable;
  &reference.spl.outeriterator;
  &reference.spl.recursiveiterator;
  &reference.spl.seekableiterator;