Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0

README.md

@@ -19,7 +19,7 @@ AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 ## Documentation
 
 * [Documentation / Manual](http://phpseclib.sourceforge.net/)
-* [API Documentation](https://api.phpseclib.org/1.0/) (generated by Sami)
+* [API Documentation](https://api.phpseclib.org/1.0/) (generated by Doctum)
 
 ## Branches
 

build/build.xml

@@ -4,7 +4,7 @@
          default="all"
 >
 
-  <target name="all" depends="sniff,api" />
+  <target name="all" depends="sniff" />
 
   <!-- Code Sniffer -->
   <target name="sniff" depends="sniff-php-code,sniff-php-tests" />
@@ -22,11 +22,4 @@
         tests/"
       dir=".." checkreturn="true" passthru="true" />
   </target>
-
-  <!-- API Generation -->
-  <target name="api">
-    <exec command="vendor/bin/sami.php update build/sami.conf.php"
-      dir=".." passthru="true" />
-  </target>
-
 </project>

build/sami.conf.php

@@ -1,32 +0,0 @@
-<?php
-
-// Prevent e.g. 'Notice: Constant MATH_BIGINTEGER_MONTGOMERY already defined'.
-class MyArrayStore extends Sami\Store\ArrayStore
-{
-    public function removeClass(Sami\Project $project, $name)
-    {
-        unset($this->classes[$name]);
-    }
-}
-
-$iterator = Symfony\Component\Finder\Finder::create()
-    ->files()
-    ->name('*.php')
-    ->in(__DIR__ . '/../phpseclib/')
-;
-
-$versions = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
-    ->add('1.0')
-    ->add('2.0')
-    ->add('master')
-;
-
-return new Sami\Sami($iterator, array(
-    'theme'                => 'enhanced',
-    'versions'             => $versions,
-    'title'                => 'phpseclib API Documentation',
-    'build_dir'            => __DIR__.'/api/output/%version%',
-    'cache_dir'            => __DIR__.'/api/cache/%version%',
-    'default_opened_level' => 2,
-    'store'                => new MyArrayStore,
-));

composer.json

@@ -56,7 +56,6 @@
     "require-dev": {
         "phing/phing": "~2.7",
         "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-        "sami/sami": "~2.0",
         "squizlabs/php_codesniffer": "~2.0"
     },
     "suggest": {