update libs

diff --git a/composer.lock b/composer.lock
index 5f82efd25afd4574cd112daace1167ff94f7b650..c6616135e2b8ae2c6ecbabec7bd7fedb195868b2 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -74,7 +74,7 @@
             "source": {
                 "type": "git",
                 "url": "git://git.andy128k.net/missing-tools.git",
-                "reference": "7d22f1cd70189d7b13d1cc30b846f9086abfc545"
+                "reference": "e5823edae0f311cdd3cac27c608fa6166df5175d"
             },
             "require": {
                 "andy128k/pegp": "0.1.*@dev",
@@ -99,7 +99,7 @@
                 }
             ],
             "description": "Miscellaneous utilities",
-            "time": "2014-11-09 08:28:31"
+            "time": "2014-12-31 09:47:01"
         },
         {
             "name": "andy128k/pegp",
@@ -170,22 +170,20 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/d11wtq/boris.git",
-                "reference": "2a0a3d3a5f34d317577f8dcd98f5f578ad85109a"
+                "reference": "3bbae98d295b94030e63e9e53e397fb8e9260544"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/d11wtq/boris/zipball/2a0a3d3a5f34d317577f8dcd98f5f578ad85109a",
-                "reference": "2a0a3d3a5f34d317577f8dcd98f5f578ad85109a",
+                "url": "https://api.github.com/repos/d11wtq/boris/zipball/3bbae98d295b94030e63e9e53e397fb8e9260544",
+                "reference": "3bbae98d295b94030e63e9e53e397fb8e9260544",
                 "shasum": ""
             },
             "require": {
+                "ext-pcntl": "*",
+                "ext-posix": "*",
+                "ext-readline": "*",
                 "php": ">=5.3.0"
             },
-            "suggest": {
-                "ext-pcntl": "Optional Process Control extension depencency",
-                "ext-posix": "Optional POSIX extension",
-                "ext-readline": "Optional readline extension depencency"
-            },
             "bin": [
                 "bin/boris"
             ],
@@ -196,7 +194,7 @@
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "time": "2014-07-31 12:15:24"
+            "time": "2014-11-18 21:00:26"
         },
         {
             "name": "lichtner/fluentpdo",
@@ -204,12 +202,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/lichtner/fluentpdo.git",
-                "reference": "82801a7bd227c0224635433acdceff96d201b062"
+                "reference": "e3d263795e2acfd03b7080eee33accae0436fee3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lichtner/fluentpdo/zipball/82801a7bd227c0224635433acdceff96d201b062",
-                "reference": "82801a7bd227c0224635433acdceff96d201b062",
+                "url": "https://api.github.com/repos/lichtner/fluentpdo/zipball/e3d263795e2acfd03b7080eee33accae0436fee3",
+                "reference": "e3d263795e2acfd03b7080eee33accae0436fee3",
                 "shasum": ""
             },
             "type": "library",
@@ -236,7 +234,7 @@
                 "dbal",
                 "pdo"
             ],
-            "time": "2014-11-07 19:35:13"
+            "time": "2014-11-11 13:51:12"
         },
         {
             "name": "pear/archive_tar",
@@ -658,17 +656,17 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.5.6",
+            "version": "v2.6.1",
             "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726"
+                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
-                "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
+                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
                 "shasum": ""
             },
             "require": {
@@ -677,7 +675,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -701,7 +699,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2014-10-01 05:50:18"
+            "time": "2014-12-02 20:19:20"
         }
     ],
     "aliases": [],

diff --git a/ipf/auth/admin.php b/ipf/auth/admin.php
index a0c39b1355f014624159c70646cc12027b7b2ac1..f794f30156eaf8363e2bccaa00e4f6e759f43bbb 100644 (file)
--- a/ipf/auth/admin.php
+++ b/ipf/auth/admin.php
@@ -173,7 +173,7 @@ class AdminUser extends \IPF_Admin_Component
 
     public function column_groups($obj)
     {
-        return \PFF\Arr::create($obj->roles())->pluck('name')->join(' / ');
+        return implode(' / ', \PFF\Arr::pluck($obj->roles(), 'name'));
     }
 
     function _searchFields()
@@ -206,8 +206,8 @@ class AdminUser extends \IPF_Admin_Component
         $extra = array();
         if ($user) {
             $extra['initial'] = array(
-                'permissions' => \PFF\Arr::create($user->permissions())->pluck('id')->arr(),
-                'roles' => \PFF\Arr::create($user->roles())->pluck('id')->arr(),
+                'permissions' => \PFF\Arr::pluck($user->permissions(), 'id'),
+                'roles' => \PFF\Arr::pluck($user->roles(), 'id'),
             );
             $extra['is_add'] = false;
         } else {
@@ -322,7 +322,7 @@ class AdminRole extends \IPF_Admin_Component
     {
         if ($role)
             return new RoleForm($data, $role, array('initial' => array(
-                'permissions' => \PFF\Arr::create($role->permissions())->pluck('id')->arr(),
+                'permissions' => \PFF\Arr::pluck($role->permissions(), 'id'),
             )));
         else
             return new RoleForm($data, null);