Merge branch 'master' of git://git.zendframework.com/zf into ZF2-13

.gitignore

@@ -1,2 +1,4 @@
 nbproject
-
+.buildpath
+.project
+.settings/

README-DEV.txt

@@ -14,7 +14,7 @@ read/subscribe to the following resources:
    http://framework.zend.com/wiki/display/ZFDEV/Contributing+to+Zend+Framework
 
  * ZF Contributor's mailing list:
-   Archives:  http://short.ie/tc64rv
+   Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
    Subscribe: [email protected]
 
  * ZF Contributor's IRC channel:

README-GIT.txt

@@ -56,7 +56,7 @@ github or other public site, or setup/use your own repository.
   Option 2: Personal Repository
   -----------------------------
 
-  We assume you will use gitosis (http://short.e/m6t2pn) or gitolite
+  We assume you will use gitosis (http://progit.org/book/ch4-7.html) or gitolite
   (http://progit.org/book/ch4-8.html) to host your own repository.  If
   you go this route, we will assume you have the knowledge to do so, or
   know where to obtain it. We will not assist you in setting up such a

README.txt

@@ -2,23 +2,19 @@ Welcome to the Zend Framework 2.0.0 Release!
 
 RELEASE INFORMATION
 ---------------
-Zend Framework 2.0.0dev2
+Zend Framework 2.0.0dev3
 
 THIS RELEASE IS A DEVELOPMENT RELEASE AND NOT INTENDED FOR PRODUCTION USE.
 PLEASE USE AT YOUR OWN RISK.
 
 NEW FEATURES
 ------------
 
-This release concludes two different milestones:
+This release contains the following:
 
- - Autoloading and Plugin Loading:
-   http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Milestones#ZendFramework2.0Milestones-Milestone%3AAutoloading%26PluginLoading
- - Exceptions
-   http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Milestones#ZendFramework2.0Milestones-Milestone%3AExceptions
-
-Several components are still in progress, or were skipped due to planned
-rewrites later.
+ - EventManager component (Zend\EventManager)
+ - Initial prototype/development of a comprehensive Dependency Injection
+   component (Zend\Di)
 
 SYSTEM REQUIREMENTS
 -------------------

bin/zf.php

@@ -605,6 +605,7 @@ protected function _runTool()
       $configOptions['classesToLoad'] = 'Zend\Tool\Project\Provider\Manifest';
 
         $autoloader = new Zend\Loader\StandardAutoloader();
+        $autoloader->setFallbackAutoloader(true);
         $autoloader->register();
 
       $console = new Zend\Tool\Framework\Client\Console\Console($configOptions);

bin/zfals.php

@@ -13,8 +13,9 @@
 }
 
 // Setup autoloading
-$loader = new Zend\Loader\StandardAutoloader();
 require_once 'Zend/Loader/StandardAutoloader.php';
+
+$loader = new Zend\Loader\StandardAutoloader();
 $loader->register();
 
 $rules = array(

demos/Zend/Service/LiveDocx/MailMerge/constructors/hosted-licensed.php

@@ -16,7 +16,7 @@
 
 $mailMerge = new MailMerge();
 
-$mailMerge->setWSDL(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL)
+$mailMerge->setWsdl(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL)
           ->setUsername(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_USERNAME)
           ->setPassword(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_PASSWORD);
 
@@ -27,7 +27,7 @@
     PHP_EOL,
     $mailMerge->getPassword(),
     PHP_EOL,
-    $mailMerge->getWSDL(),
+    $mailMerge->getWsdl(),
     PHP_EOL,
     PHP_EOL
 );

demos/Zend/Service/LiveDocx/MailMerge/constructors/public-zend_config.php

@@ -26,7 +26,7 @@
     PHP_EOL,
     $mailMerge->getPassword(),
     PHP_EOL,
-    $mailMerge->getWSDL(),
+    $mailMerge->getWsdl(),
     PHP_EOL,
     PHP_EOL
 );

demos/Zend/Service/LiveDocx/MailMerge/constructors/public.php

@@ -26,7 +26,7 @@
     PHP_EOL,
     $mailMerge->getPassword(),
     PHP_EOL,
-    $mailMerge->getWSDL(),
+    $mailMerge->getWsdl(),
     PHP_EOL,
     PHP_EOL
 );
@@ -51,7 +51,7 @@
     PHP_EOL,
     $mailMerge->getPassword(),
     PHP_EOL,
-    $mailMerge->getWSDL(),
+    $mailMerge->getWsdl(),
     PHP_EOL,
     PHP_EOL
 );

demos/Zend/Service/LiveDocx/MailMerge/pdf-security/generate-document.php

@@ -9,7 +9,7 @@
 $mailMerge = new MailMerge();
 
 // Set WSDL of your *premium* service server
-$mailMerge->setWSDL(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL);
+$mailMerge->setWsdl(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL);
 
 // Set username and password of your *premium* service server
 $mailMerge->setUsername(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_USERNAME)

demos/Zend/Service/LiveDocx/MailMerge/pdf-security/show-document-access-options.php

@@ -17,7 +17,7 @@
 $mailMerge = new MailMerge();
 
 // Set WSDL of your *premium* service server
-$mailMerge->setWSDL(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL);
+$mailMerge->setWsdl(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL);
 
 // Set username and password of your *premium* service server
 $mailMerge->setUsername(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_USERNAME)

demos/Zend/Service/LiveDocx/MailMerge/subtemplates/common.php

@@ -0,0 +1,13 @@
+<?php
+
+require_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Bootstrap.php';
+
+
+$templateFilename     = 'maintemplate.docx';
+$subTemplate1Filename = 'subtemplate1.docx';
+$subTemplate2Filename = 'subtemplate2.docx';
+
+$templateFilesnames   = array();
+$templateFilesnames[] = $templateFilename;
+$templateFilesnames[] = $subTemplate1Filename;
+$templateFilesnames[] = $subTemplate2Filename;

demos/Zend/Service/LiveDocx/MailMerge/subtemplates/set-ignore-sub-templates.php

@@ -0,0 +1,52 @@
+<?php
+
+require_once __DIR__ . '/common.php';
+
+
+use Zend\Service\LiveDocx\MailMerge;
+
+// -----------------------------------------------------------------------------
+
+$mailMerge = new MailMerge();
+
+$mailMerge->setUsername(DEMOS_ZEND_SERVICE_LIVEDOCX_USERNAME)
+          ->setPassword(DEMOS_ZEND_SERVICE_LIVEDOCX_PASSWORD);
+
+// -----------------------------------------------------------------------------
+
+foreach ($templateFilesnames as $_templateFilesname) {
+
+    if ($mailMerge->templateExists($_templateFilesname)) {
+        $mailMerge->deleteTemplate($_templateFilesname);
+    }
+
+    $mailMerge->uploadTemplate($_templateFilesname);
+}
+
+// -----------------------------------------------------------------------------
+
+$mailMerge->setIgnoreSubTemplates(true);            // <-- Does NOT include any sub-templates.
+
+$mailMerge->setRemoteTemplate($templateFilename);
+
+$mailMerge->createDocument();
+
+$document = $mailMerge->retrieveDocument('pdf');
+
+file_put_contents('document1.pdf', $document);
+
+// -----------------------------------------------------------------------------
+
+$mailMerge->setIgnoreSubTemplates(false);           // <-- Includes all sub-templates.
+                                                    //     Default, when setIgnoreSubTemplates is not called.
+$mailMerge->setRemoteTemplate($templateFilename);
+
+$mailMerge->createDocument();
+
+$document = $mailMerge->retrieveDocument('pdf');
+
+file_put_contents('document2.pdf', $document);
+
+// -----------------------------------------------------------------------------
+
+unset($mailMerge);

demos/Zend/Service/LiveDocx/MailMerge/subtemplates/set-sub-template-ignore-list.php

@@ -0,0 +1,65 @@
+<?php
+
+require_once __DIR__ . '/common.php';
+
+
+use Zend\Service\LiveDocx\MailMerge;
+
+// -----------------------------------------------------------------------------
+
+$mailMerge = new MailMerge();
+
+$mailMerge->setWsdl(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL)
+          ->setUsername(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_USERNAME)
+          ->setPassword(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_PASSWORD);
+
+// -----------------------------------------------------------------------------
+
+foreach ($templateFilesnames as $_templateFilesname) {
+
+    if ($mailMerge->templateExists($_templateFilesname)) {
+        $mailMerge->deleteTemplate($_templateFilesname);
+    }
+
+    $mailMerge->uploadTemplate($_templateFilesname);
+}
+
+// -----------------------------------------------------------------------------
+
+$mailMerge->setSubTemplateIgnoreList(array($subTemplate1Filename, $subTemplate2Filename));
+
+$mailMerge->setRemoteTemplate($templateFilename);
+
+$mailMerge->createDocument();
+
+$document = $mailMerge->retrieveDocument('pdf');
+
+file_put_contents('document1.pdf', $document);
+
+// -----------------------------------------------------------------------------
+
+$mailMerge->setSubTemplateIgnoreList(array($subTemplate1Filename));
+
+$mailMerge->setRemoteTemplate($templateFilename);
+
+$mailMerge->createDocument();
+
+$document = $mailMerge->retrieveDocument('pdf');
+
+file_put_contents('document2.pdf', $document);
+
+// -----------------------------------------------------------------------------
+
+$mailMerge->setSubTemplateIgnoreList(array($subTemplate2Filename));
+
+$mailMerge->setRemoteTemplate($templateFilename);
+
+$mailMerge->createDocument();
+
+$document = $mailMerge->retrieveDocument('pdf');
+
+file_put_contents('document3.pdf', $document);
+
+// -----------------------------------------------------------------------------
+
+unset($mailMerge);

demos/Zend/Service/LiveDocx/check-environment.php

@@ -260,7 +260,7 @@
     $mailMerge = new MailMerge();
     $mailMerge->setUsername(DEMOS_ZEND_SERVICE_LIVEDOCX_USERNAME)
               ->setPassword(DEMOS_ZEND_SERVICE_LIVEDOCX_PASSWORD)
-              ->logIn();
+              ->listTemplates();
     $duration = microtime(true) - $microtime;
     unset($mailMerge);
 } catch (Exception $e) {
@@ -319,7 +319,7 @@
         $mailMerge->setWsdl(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_WSDL)
                   ->setUsername(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_USERNAME)
                   ->setPassword(DEMOS_ZEND_SERVICE_LIVEDOCX_PREMIUM_PASSWORD)
-                  ->logIn();
+                  ->listTemplates();
         $duration = microtime(true) - $microtime;
         unset($mailMerge);
     } catch (Exception $e) {