Skip to content
This repository has been archived by the owner on Mar 14, 2019. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/117'
Browse files Browse the repository at this point in the history 
Close #117
Close zendframework/zf1#38
  • Loading branch information
@weierophinney
weierophinney committed Aug 23, 2013
2 parents da2a2e8 + 655007b commit 5f7e281
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 49 deletions.
109 changes: 60 additions & 49 deletions config/autoload/page-controller.global.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
return array(
'router' => array(
'routes' => array(
'participate' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'participate' => array(
'type' => 'Segment',
'options' => array(
'route' => '/participate[/]',
'defaults' => array(
'__NAMESPACE__' => 'PageController\Controller',
Expand All @@ -14,92 +14,92 @@
),
'may_terminate' => true,
'child_routes' => array(
'contribute' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'contribute' => array(
'type' => 'Segment',
'options' => array(
'route' => 'contributor-guide[/]',
'defaults' => array(
'page' => 'participate/contributor-guide',
'page' => 'participate/contributor-guide',
),
),
'may_terminate' => true,
),
'contribute-v1' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'type' => 'Segment',
'options' => array(
'route' => 'contributor-guide-v1[/]',
'defaults' => array(
'page' => 'participate/contributor-guide-v1',
'page' => 'participate/contributor-guide-v1',
),
),
'may_terminate' => true,
),
'conferences' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'conferences' => array(
'type' => 'Segment',
'options' => array(
'route' => 'conferences[/]',
'defaults' => array(
'page' => 'participate/conferences',
'page' => 'participate/conferences',
),
),
'may_terminate' => true,
),
'user-groups' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'user-groups' => array(
'type' => 'Segment',
'options' => array(
'route' => 'user-groups[/]',
'defaults' => array(
'page' => 'participate/user-groups',
'page' => 'participate/user-groups',
),
),
'may_terminate' => true,
),
'blogs' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'blogs' => array(
'type' => 'Segment',
'options' => array(
'route' => 'blogs[/]',
'defaults' => array(
'page' => 'participate/blogs',
'page' => 'participate/blogs',
),
),
'may_terminate' => true,
),
'contributors' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'contributors' => array(
'type' => 'Segment',
'options' => array(
'route' => 'contributors[/]',
'defaults' => array(
'page' => 'participate/contributors',
'page' => 'participate/contributors',
),
),
'may_terminate' => true,
),
'logos' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'logos' => array(
'type' => 'Segment',
'options' => array(
'route' => 'logos[/]',
'defaults' => array(
'page' => 'participate/logos',
'page' => 'participate/logos',
),
),
'may_terminate' => true,
),
),
),
'irc' => array(
'type' => 'Segment',
'irc' => array(
'type' => 'Segment',
'options' => array(
'route' => '/irc[/]',
'route' => '/irc[/]',
'defaults' => array(
'__NAMESPACE__' => 'PageController\Controller',
'controller' => 'Page',
'page' => 'contact/irc',
),
),
),
'about' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'about' => array(
'type' => 'Segment',
'options' => array(
'route' => '/about[/]',
'defaults' => array(
'__NAMESPACE__' => 'PageController\Controller',
Expand All @@ -109,48 +109,59 @@
),
'may_terminate' => true,
'child_routes' => array(
'faq' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'faq' => array(
'type' => 'Segment',
'options' => array(
'route' => 'faq[/]',
'defaults' => array(
'page' => 'about/faq',
'page' => 'about/faq',
),
),
'may_terminate' => true,
),
'faq-v1' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'type' => 'Segment',
'options' => array(
'route' => 'faq-v1[/]',
'defaults' => array(
'page' => 'about/faq-v1',
'page' => 'about/faq-v1',
),
),
'may_terminate' => true,
),
),
),
'license' => array(
'type' => 'Segment',
'options' => array(
'route' => '/license[/]',
'license' => array(
'type' => 'Segment',
'options' => array(
'route' => '/license[/]',
'defaults' => array(
'__NAMESPACE__' => 'PageController\Controller',
'controller' => 'Page',
'page' => 'license',
),
),
'may_terminate' => true,
'child_routes' => array(
'child_routes' => array(
'new-bsd' => array(
'type' => 'Literal',
'type' => 'Literal',
'options' => array(
'route' => 'new-bsd',
),
),
),
),
'zend-config-xml' => array(
'type' => 'Segment',
'options' => array(
'route' => '/xml/zend-config-xml/1.0[/]',
'defaults' => array(
'__NAMESPACE__' => 'PageController\Controller',
'controller' => 'Page',
'page' => 'zend-config-xml-1-0',
),
),
),
),
),
);
13 changes: 13 additions & 0 deletions module/PageController/view/page-controller/zend-config-xml-1-0.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<h1>Zend_Config_Xml - Namespace</h1>

<p>
The XML namespace <code>http://framework.zend.com/xml/zend-config-xml/1.0/</code>
is intended for use with parsing <code>Zend_Config_Xml</code>, and specifically
for providing PHP constant support.
</p>

<p>
Please see the note entitled "Zend_Config XML namespace" in the <a
href="<?php echo $this->basePath('manual/en/zend.config.adapters.xml.html') ?>">Zend_Config_Xml</a>
documentation for more information.
</p>

0 comments on commit 5f7e281

Please sign in to comment.