Update XMPP library

Author: fguillot

Makefile

@@ -1,3 +1,4 @@
+plugin=Jabber
 all:
 	@ echo "Build archive for plugin ${plugin} version=${version}"
 	@ git archive HEAD --prefix=${plugin}/ --format=zip -o ${plugin}-${version}.zip

Plugin.php

@@ -42,7 +42,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.0.7';
+        return '1.0.8';
     }
 
     public function getPluginHomepage()

README.md

@@ -60,6 +60,11 @@ Go to **Settings > Integrations > Jabber** and fill the form:
 Changes
 -------
 
+### Version 1.0.8
+
+- Update XMPP library
+- Update Documentation links
+
 ### Version 1.0.7
 
 - Fix bug concerning task overdue events

Template/config/integration.php

@@ -16,7 +16,7 @@
     <?= $this->form->label(t('Jabber nickname for Kanboard'), 'jabber_nickname') ?>
     <?= $this->form->text('jabber_nickname', $values, array()) ?>
 
-    <p class="form-help"><a href="https://kanboard.net/plugin/jabber" target="_blank"><?= t('Help on Jabber integration') ?></a></p>
+    <p class="form-help"><a href="https://github.com/kanboard/plugin-jabber#configuration" target="_blank"><?= t('Help on Jabber integration') ?></a></p>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>

Template/project/integration.php

@@ -3,7 +3,7 @@
     <?= $this->form->label(t('Multi-user chat room'), 'jabber_room') ?>
     <?= $this->form->text('jabber_room', $values, array(), array('placeholder="myroom@conference.example.com"')) ?>
 
-    <p class="form-help"><a href="https://kanboard.net/plugin/jabber" target="_blank"><?= t('Help on Jabber integration') ?></a></p>
+    <p class="form-help"><a href="https://github.com/kanboard/plugin-jabber#configuration" target="_blank"><?= t('Help on Jabber integration') ?></a></p>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>

Template/user/integration.php

@@ -3,7 +3,7 @@
     <?= $this->form->label(t('Jabber Id'), 'jabber_jid') ?>
     <?= $this->form->text('jabber_jid', $values) ?>
 
-    <p class="form-help"><a href="https://kanboard.net/plugin/jabber" target="_blank"><?= t('Help on Jabber integration') ?></a></p>
+    <p class="form-help"><a href="https://github.com/kanboard/plugin-jabber#configuration" target="_blank"><?= t('Help on Jabber integration') ?></a></p>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>

composer.json

@@ -14,7 +14,6 @@
         "discard-changes": true
     },
     "require" : {
-        "php" : ">=5.3",
-        "fabiang/xmpp" : "0.6.1"
+        "fabiang/xmpp" : "0.7.0"
     }
 }

composer.lock

@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit0974ba0e8d42c8958de6db3414ec99de::getLoader();

vendor/autoload.php

@@ -13,9 +13,7 @@
 namespace Composer\Autoload;
 
 /**
- * ClassLoader implements a PSR-0 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
  *
  *     $loader = new \Composer\Autoload\ClassLoader();
  *
@@ -39,6 +37,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
@@ -53,8 +53,9 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
-
     private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
 
     public function getPrefixes()
     {
@@ -147,7 +148,7 @@ public function add($prefix, $paths, $prepend = false)
      * appending or prepending to the ones previously set for this namespace.
      *
      * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-0 base directories
+     * @param array|string $paths   The PSR-4 base directories
      * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
@@ -271,6 +272,26 @@ public function isClassMapAuthoritative()
         return $this->classMapAuthoritative;
     }
 
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
     /**
      * Registers this instance as an autoloader.
      *
@@ -313,29 +334,34 @@ public function loadClass($class)
      */
     public function findFile($class)
     {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
         // class map lookup
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if ($file === null) {
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
             // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
+            $this->missingClasses[$class] = true;
         }
 
         return $file;
@@ -348,9 +374,13 @@ private function findFileWithExtension($class, $ext)
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
                         if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
@@ -399,6 +429,8 @@ private function findFileWithExtension($class, $ext)
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }