scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from branch 2.7 ready for release

Browse Source
This commit is contained in:
Michael RICOIS 2015-02-12 14:57:05 +00:00
commit 5e131027d6
2727 changed files with 33929 additions and 17309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
application/controllers/EvaluationController.php
View File

@ -182,8 +182,8 @@ class EvaluationController extends Zend_Controller_Action
//Assign vars
$this->view->assign('scores', $histoScores->result->item);
if ($histoScores->type == 'indiScore20') $histoScores->type = 'indiScore';
$this->view->assign('type', $histoScores->type);
$this->view->assign('typeTxt', $histoScores->type);
$this->view->assign('type', $type);
$this->view->assign('bornes', $bornes);
}
@ -209,8 +209,8 @@ class EvaluationController extends Zend_Controller_Action
$request = $this->getRequest();
$autrePage = $request->getParam('apage');
//Récupération des informations
if (empty($autrePage)) {
// --- Récupération des informations
if ( empty($autrePage) ) {
$this->view->headTitle()->prepend('IndiScore');
$this->view->headTitle()->prepend('Siret '.$this->siret);
$plus = false;
@ -252,12 +252,13 @@ class EvaluationController extends Zend_Controller_Action
$siren = substr($this->siret,0,9);
//@todo : transformer le webservice pour ne faire qu'une seule requete
$ws = new WsScores();
$entreprise = new Scores_Session_Entreprise($this->siret, $this->id);
$identite = $ws->getIdentite($siren);
$indiscore = $ws->getIndiScore($siren);
$infos = $ws->getRatios($siren, 'indiscore2'); // @todo : vérifier la page
$infos = $ws->getRatios($siren, 'indiscore2');
$score = array();
$tabRatio = array(
'r5' => array('total'=>'r5', 'total_info'=>'% ca', 'op' => 1000, 'titre'=>'CHIFFRE D\'AFFAIRES'),
@ -280,7 +281,8 @@ class EvaluationController extends Zend_Controller_Action
if ($nbBilanN!=0)
{
foreach($tabRatio as $idRatio => $valRatio){
foreach($tabRatio as $idRatio => $valRatio)
{
$tabRatio[$idRatio]['comment'] = $ratiosData->wrapComment($idRatio);
}
$this->view->assign('tabRatio', $tabRatio);
@ -294,15 +296,18 @@ class EvaluationController extends Zend_Controller_Action
$annees = array_slice($annees, 0, $nbMaxBilan);
sort($annees);
$tabResult = array();
foreach($annees as $annee){
foreach($annees as $annee)
{
$data = array();
$dataEvol = array();
//Formatter les données
foreach($tabRatio as $idRatio => $valRatio){
foreach($tabRatio as $idRatio => $valRatio)
{
$data[$idRatio] = $ratiosData->dRatio($typeBilan, $annee, $idRatio);
$dataTotal[$idRatio] = $ratiosData->dTotal($typeBilan, $annee, $idRatio, $valRatio['total']);
$dInfo[$idRatio] = $valRatio['total_info'];
}
$date = new Zend_Date($annee, 'yyyyMMdd');
$tabResult[] = array(
'dateCloture' => $date->toString('dd/MM/yyyy'),
@ -363,6 +368,8 @@ class EvaluationController extends Zend_Controller_Action
foreach($indiscore->scores as $name => $sc){
if($name == 'ConanH')
$score[$name] = array($sc, 'Score Conan Holder');
if($name == 'Afdcc1')
$score[$name] = array($sc, 'Score Afdcc 1');
if($name == 'Afdcc2')
$score[$name] = array($sc, 'Score Afdcc 2');
if($name == 'Z')

4
application/controllers/FinanceController.php
View File

@ -429,8 +429,6 @@ class FinanceController extends Zend_Controller_Action
$typeBilan = $request->getParam('typeBilan');
$dateCloture = $request->getParam('dateCloture');
Zend_Registry::get('firebug')->info($request->getParams());
$c = Zend_Registry::get('config');
$path = $c->profil->path->pages . '/imgcache/';
switch($type){
@ -708,7 +706,6 @@ class FinanceController extends Zend_Controller_Action
$this->view->assign('email', $user->getEmail());
$this->view->assign('siren', $params['siren']);
Zend_Registry::get('firebug')->info($params);
$ref = $params['ref'];
@ -1420,7 +1417,6 @@ class FinanceController extends Zend_Controller_Action
$ws = new WsScores();
$response = $ws->getEntrepriseLiasseInfos($siren);
Zend_Registry::get('firebug')->info($response);
if ( $response === null ) {
$this->view->assign('msg','Aucun bilan déposé.');
} else {

9
application/controllers/IdentiteController.php
View File

@ -638,8 +638,6 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('surveillance', $user->checkPerm('survdirigeants'));
}
Zend_Registry::get('firebug')->info($identite);
if ($identite->PpPm=='PP') {
$this->view->assign('PP', true);
$this->view->assign('nom', $identite->nom);
@ -675,7 +673,6 @@ class IdentiteController extends Zend_Controller_Action
}
$infos = $ws->getLiens($siren);
Zend_Registry::get('firebug')->info($infos);
if (is_string($infos) || $infos === false) $this->_forward('soap', 'error');
}
@ -2005,7 +2002,7 @@ class IdentiteController extends Zend_Controller_Action
$pdf->setColorArray('text', array(255,0,0));
$pdf->Cell(0, 0, "Cette entreprise est radiée au RNCS.", 0, 1, 'C');
}
$pdf->setColorArray('text', array(255,255,255));
$pdf->setColorArray('text', array(0,0,0));
$pdf->Cell(0, 0, "Dénomination sociale : ".$Nom, 0, 1, 'L');
if( empty($Sigle) ) {
$pdf->Cell(0, 0, "Sigle : -", 0, 1, 'L');
@ -2017,10 +2014,10 @@ class IdentiteController extends Zend_Controller_Action
} else {
$pdf->Cell(0, 0, "Enseigne : ".$Enseigne, 0, 1, 'L');
}
if( empty($Sigle) ) {
if( empty($NomCommercial) ) {
$pdf->Cell(0, 0, "Nom Commercial : -", 0, 1, 'L');
} else {
$pdf->Cell(0, 0, "Nom Commercial : ".$NomComercial, 0, 1, 'L');
$pdf->Cell(0, 0, "Nom Commercial : ".$NomCommercial, 0, 1, 'L');
}
$pdf->Cell(0, 0, "Numéro d'identification : ".$Siren." RCS ".$Tribunal, 0, 1, 'L');
$pdf->Cell(0, 0, "Numéro de gestion : ".$NumGest, 0, 1, 'L');

25
application/controllers/JuridiqueController.php
View File

@ -20,6 +20,7 @@ class JuridiqueController extends Zend_Controller_Action
{
$request = $this->getRequest();
$autrePage = $request->getParam('apage');
$vue = $request->getParam('vue', 'bodacc');
$idAnn = $request->getParam('idAnn', null);
@ -44,7 +45,7 @@ class JuridiqueController extends Zend_Controller_Action
$this->view->assign('siren', $siren);
$this->view->assign('siret', $this->siret);
$this->view->assign('raisonSociale', $session->getRaisonSociale());
$this->view->assign('AutrePage', $request->getParam('apage'));
$this->view->assign('AutrePage', $autrePage);
if ($session->getSource()=='006' || $session->getSourceId()=='007') {
@ -166,18 +167,20 @@ class JuridiqueController extends Zend_Controller_Action
$this->renderScript('juridique/annonce.phtml');
}
//Affichage pour la liste des annonces
// --- Affichage pour la liste des annonces
} else {
//Titre de la page
if( empty($siren) ){
$titre = 'Identifiant '.$this->id;
} else {
$titre = 'Siret '.$siren;
}
$this->view->headTitle()->prepend('Annonces Légales - '.$titre);
//Calcul pagination
// --- Titre de la page
if ( empty($autrePage) ) {
if( empty($siren) ){
$titre = 'Identifiant '.$this->id;
} else {
$titre = 'Siret '.$siren;
}
$this->view->headTitle()->prepend('Annonces Légales - '.$titre);
}
// ---- Calcul pagination
$nbReponses = count($infos->result->item);
$nbReponsesTotal = $infos->nbReponses;
if ($nbReponses < $nbReponsesTotal) {

3
application/controllers/PrintController.php
View File

@ -30,8 +30,7 @@ class PrintController extends Zend_Controller_Action
$params['mil'] = $elements[5];
break;
case 'liasse':
$params['unit'] = $elements[4];
$params['date'] = $elements[5];
$params['date'] = $elements[3];
break;
}
$params['siret'] = $elements[2];

9
application/views/default/scripts/dirigeant/histo.phtml
View File

@ -36,9 +36,12 @@
<td class="StyleInfoData" width="270"><?=$dir->Titre?></td>
<td class="StyleInfoData" width="200"><?=$dir->Societe.' '.$dir->Nom.' '.$dir->Prenom?></td>
<td class="StyleInfoData" width="200">
<?php $date = new Zend_Date($dir->DateFct,'yyyy-MM-dd'); ?>
<?php if ( Zend_Date::isDate($date) ) { ?>
<?=$this->translate("Modification le") . ' ' . $date->toString('dd/MM/yyyy');?>
<?php
if ($dir->DateFct != '0000-00-00') {
$date = new Zend_Date($dir->DateFct,'yyyy-MM-dd'); ?>
<?php if ( Zend_Date::isDate($date) ) { ?>
<?=$this->translate("Modification le") . ' ' . $date->toString('dd/MM/yyyy');?>
<?php }?>
<?php }?>
</td>
</tr>

6
application/views/default/scripts/evaluation/indiscore.phtml
View File

@ -202,8 +202,9 @@ if ($this->indiscore->Enseigne!='' && $this->indiscore->Sigle!='') {
<tr>
<td width="30">&nbsp;</td>
<td width="550" colspan="2" class="StyleInfoData">
<i>Pour information, les méthodes standards donnent : Conan &amp; Holder = <b><?php echo $this->indiscore->scores->ConanH;?></b>,
Afdcc2 = <b><?php echo $this->indiscore->scores->Afdcc2;?></b> et Score Z = <b><?php echo $this->indiscore->scores->Z;?></b>.</i>
<i>Pour information, les méthodes standards donnent : Conan &amp; Holder = <b><?php echo $this->indiscore->scores->ConanH;?></b>,
Afdcc1 = <b><?php echo $this->indiscore->scores->Afdcc1;?></b>, Afdcc2 = <b><?php echo $this->indiscore->scores->Afdcc2;?></b>
et Score Z = <b><?php echo $this->indiscore->scores->Z;?></b>.</i>
</td>
</tr>
@ -281,6 +282,7 @@ if ($this->indiscore->Enseigne!='' && $this->indiscore->Sigle!='') {
</td>
</tr>
<tr><td colspan="3" align="center"><img class="notvisible" src="/themes/default/images/indiscore/logo_indiscore.png"/></td></tr>
</table>
</div>

5
application/views/default/scripts/evaluation/indiscore2.phtml
View File

@ -55,9 +55,6 @@ echo $this->action('liens', 'identite', null, array('siret' => $this->siret, 'id
</tr>
</thead>
<tbody>
<?php
Zend_Registry::get('firebug')->info($this->tabResult);
?>
<?php foreach($this->tabRatio as $ratio => $info) { ?>
<tr>
<td class="head"><a class="tooltip" title="<?=$info['comment']?>"><?=$info['titre']?></a></td>
@ -66,7 +63,7 @@ Zend_Registry::get('firebug')->info($this->tabResult);
<td class="right"><?=$this->tabResult[1]['ratio'][$ratio]?></td>
<td class="right" title="<?=$this->tabResult[1]['info'][$ratio]?>"><?=$this->tabResult[1]['total'][$ratio]?> %</td>
<td class="right"><?=$this->tabResult[2]['ratio'][$ratio]?></td>
<td class="right" title="<?=$this->tabResult[2]['info'][$ratio]?>"><?=$this->tabResult[3]['total'][$ratio]?> %</td>
<td class="right" title="<?=$this->tabResult[2]['info'][$ratio]?>"><?=$this->tabResult[2]['total'][$ratio]?> %</td>
</tr>
<?php }?>
</tbody>

64
application/views/default/scripts/evaluation/indiscorehisto.phtml
View File

@ -1,64 +0,0 @@
<div id="center">
<h1><?=$this->translate('HISTORIQUE INDISCORE')?></h1>
<div class="paragraph">
<table>
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib"><?=$this->translate('Numéro identifiant Siren')?></td>
<td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
</tr>
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib"><?=$this->translate('Dénomination sociale')?></td>
<td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
</tr>
</table>
</div>
<h2><?=$this->translate('Historique des scores')?></h2>
<?php if ( count($this->scores)> 0 ) {?>
<div class="paragraph">
<table id="synthese">
<thead>
<tr class="head">
<th align="center"><?=$this->translate('Date')?></td>
<th align="center"><?=$this->translate('IndiScore')?></td>
<th><?=$this->translate('Motif du changement')?></td>
</tr>
</thead>
<tbody>
<?php foreach($this->scores as $score) {?>
<tr>
<td align="center">
<?php $date = new Zend_Date($score->date, 'yyyy-MM-dd');?>
<?=$date->toString('dd/MM/yyyy')?>
</td>
<td align="center"><?=$score->value?> </td>
<td><?=$score->label?></td>
</tr>
</tbody>
<?php }?>
</table>
</div>
<div class="paragraph">
<?php if ( $this->graph ) {?>
<img src="/fichier/imgcache/<?=$this->graph?>">
<?php } else {?>
<b><?=$this->translate('Impossible de générer le graphique')?></b>
<?php }?>
</div>
<?php } else {?>
<div class="paragraph">
<?=$this->translate("Aucune information sur l'historique disponible.")?>
</div>
<?php }?>
<?=$this->render('cgu.phtml', $this->cgu)?>
</div>

47
application/views/default/scripts/evaluation/scoreshisto.phtml
View File

@ -33,45 +33,52 @@ $('select[name=type]').change(function(e){
<div class="paragraph">
<p>
<?php switch ( $this->type ) {
case 'indiScore':?>
<?php switch ( $this->typeTxt ) {?>
<?php case 'indiScore20':?>
L'indiscore évalue le risque de faillite d'entreprise à 12 mois à partir de trois axes: le respect,
l'analyse historique des représentants légaux et l'analyse du bilan. Les informations sur l’environnement économique
des entreprises (secteurs d'activité, groupe, paiements) complète l'analyse de l'indiscore. Un indiscore entre 0 et
8/20 indiquera un risque élevé, entre 8 et 12/20 un risque moyen et un indiscore compris entre 12 et 20/20
un risque faible. Un avis de crédit fournisseur/client est donné, jusqu'à concurrence de 500 K€.
<?php break; ?>
<?php case 'indiScore':?>
L'indiscore évalue le risque de faillite d'entreprise à 12 mois à partir de trois axes: le respect,
l'analyse historique des représentants légaux et l'analyse du bilan. Les informations sur l’environnement économique
des entreprises (secteurs d'activité, groupe, paiements) complète l'analyse de l'indiscore. Un indiscore entre 0 et
35/100 indiquera un risque élevé, entre 35 et 55/100 un risque moyen et un indiscore compris entre 55 et 100/100
un risque faible. Un avis de crédit fournisseur/client est donné, jusqu'à concurrence de 500 K€.
<?php break;
case 'scoreDir':?>
<?php break; ?>
<?php case 'scoreDir':?>
Évaluation de l'équipe dirigeante en place. Système S&D
<?php break;
case 'scoreConf':?>
<?php break; ?>
<?php case 'scoreConf':?>
Évaluation de l'adéquation entre les déclarations et l'information disponible auprès des sources officielles françaises. Système S&D
<?php break;
case 'scoreZ':?>
<?php break; ?>
<?php case 'scoreZ':?>
Le score Z de la Banque de France permet de déceler les défaillances d’entreprises. Ces dernières sont caractérisées
par 19 ratios retraçant quatre aspects de leur comportement : structure financière, dynamisme, rentabilité, gestion courante.
<?php break;
case 'scoreCH':?>
<?php break; ?>
<?php case 'scoreCH':?>
Le score CONAN et HOLDER (1979) est une méthode conseillée pour les entreprises industrielles réalisant un chiffre
d'affaires de 1,5 à 75 millions d’euros. Il permet un classement des sociétés des plus risquées (score inférieur à
6,8) aux plus saines (score supérieur à 16,4).
<?php break;
case 'scoreAfdcc1':?>
<?php break; ?>
<?php case 'scoreAfdcc1':?>
1er indicateur synthétique de vulnérabilité établi par l'Association Françaises des Crédits managers et Conseils.
<?php break;
case 'scoreAfdcc2':?>
<?php break; ?>
<?php case 'scoreAfdcc2':?>
Le score sectoriel AFDCC2 (1999) s’applique aux sociétés réalisant un chiffre d’affaires de 150.000 à 75 millions
d'euros. Il comprend 11 fonctions pour 7 secteurs d'activité en différenciant les TPE des PME. Il s'adresse plus
spécialement au Credit Manager, étant axé sur la solvabilité de l'entreprise à court terme.
<?php break;
case 'scoreAltman':?>
<?php break; ?>
<?php case 'scoreAltman':?>
Évaluation synthétique permettant la prévision de défaillance d'une entreprise à partir de ratios, liquidité,
solvablilité, rentabilité, activité, croissance. Appelé aussi Z Score d'Altman.
<?php break;
case 'scoreCCF':?>
<?php break; ?>
<?php case 'scoreCCF':?>
Évaluation à 3 ans de la probabilité de défaillance d'une entreprise.
<?php break;
}?>
<?php break; ?>
<?php }?>
</p>
</div>

2
application/views/default/scripts/finance/liasse/2050.phtml
View File

@ -22,9 +22,9 @@
<td align="center">AA</td>
<td align="right" class="amount-value" class="amount-value"><?php echo $this->liasse['AA'];?></td>
<td></td>
<td align="right" class="amount-value">&nbsp;</td>
<td align="right" class="amount-value"><?php echo $this->liasse['AA2'];?></td>
<td align="right" class="amount-value"><?php echo $this->liasse['AA3'];?></td>
<td align="right" class="amount-value"></td>
</tr>
<tr>
<td>Frais d'établissement</td>

6
application/views/default/scripts/print/ecran.phtml
View File

@ -4,10 +4,6 @@ window.onload = function() {
}
</script>
<style>
body {font-family:Verdana, Arial, sans-serif;font-size: 11px;}
#global {width:auto !important;text-align:left;}
#content {margin:5px; padding:0; width:auto;}
table {page-break-inside:avoid}
div.paragraph {page-break-inside:avoid}
#content {float:none;clear:both;width:auto;padding:0;margin:0;padding-top:20px;}
</style>
<?=$this->action($this->action, $this->controller, null, $this->params)?>

2
application/views/default/scripts/saisie/liasse/2050.phtml
View File

@ -1327,7 +1327,7 @@
<td align="center">LI</td>
<td align="right"><?=$this->Editable('LI',$this->liasse['LI'],'poste');?></td>
<td align="center">LJ</td>
<td align="right"><?=$this->Editable('LJ',$this->liasse['LJ'],'LJ','poste');?></td>
<td align="right"><?=$this->Editable('LJ',$this->liasse['LJ'],'poste');?></td>
</tr>
<tr>
<td colspan="2">Avances et acomptes</td>

6
bin/classmap_generator.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Loader
* @subpackage Exception
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -192,7 +192,7 @@ if ($appending) {
$content = var_export((array) $map, true) . ';';
// Prefix with dirname(__FILE__); modify the generated content
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '", $content);
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '/", $content);
// Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
$content = str_replace("\\'", "'", $content);
@ -215,7 +215,7 @@ if ($appending) {
. 'return ' . var_export((array) $map, true) . ';';
// Prefix with dirname(__FILE__); modify the generated content
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '", $content);
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '/", $content);
// Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
$content = str_replace("\\'", "'", $content);

2
bin/zf.bat
View File

@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
REM to license@zend.com so we can send you a copy immediately.
REM
REM Zend
REM Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
REM Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
REM http://framework.zend.com/license/new-bsd New BSD License

4
bin/zf.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Tool
* @subpackage Framework
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
* @category Zend
* @package Zend_Tool
* @subpackage Framework
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class ZF

2
bin/zf.sh
View File

@ -14,7 +14,7 @@
# to license@zend.com so we can send you a copy immediately.
#
# Zend
# Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
# Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
# http://framework.zend.com/license/new-bsd New BSD License
#############################################################################

171
data/pages/themes/default/styles/main.css
View File

@ -1,4 +1,4 @@
/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
/**
* 1. Set default font family to sans-serif.
@ -24,7 +24,10 @@ body {
========================================================================== */
/**
* Correct `block` display not defined in IE 8/9.
* Correct `block` display not defined for any HTML5 element in IE 8/9.
* Correct `block` display not defined for `details` or `summary` in IE 10/11
* and Firefox.
* Correct `block` display not defined for `main` in IE 11.
*/
article,
@ -36,6 +39,7 @@ footer,
header,
hgroup,
main,
menu,
nav,
section,
summary {
@ -66,8 +70,8 @@ audio:not([controls]) {
}
/**
* Address `[hidden]` styling not present in IE 8/9.
* Hide the `template` element in IE, Safari, and Firefox < 22.
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
*/
[hidden],
@ -83,7 +87,7 @@ template {
*/
a {
background: transparent;
background-color: transparent;
}
/**
@ -99,7 +103,7 @@ a:hover {
========================================================================== */
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
*/
abbr[title] {
@ -107,7 +111,7 @@ abbr[title] {
}
/**
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
*/
b,
@ -116,7 +120,7 @@ strong {
}
/**
* Address styling not present in Safari 5 and Chrome.
* Address styling not present in Safari and Chrome.
*/
dfn {
@ -125,7 +129,7 @@ dfn {
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
* contexts in Firefox 4+, Safari, and Chrome.
*/
h1 {
@ -174,7 +178,7 @@ sub {
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9.
* Remove border when inside `a` element in IE 8/9/10.
*/
img {
@ -182,7 +186,7 @@ img {
}
/**
* Correct overflow displayed oddly in IE 9.
* Correct overflow not hidden in IE 9/10/11.
*/
svg:not(:root) {
@ -193,7 +197,7 @@ svg:not(:root) {
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari 5.
* Address margin not present in IE 8/9 and Safari.
*/
figure {
@ -242,7 +246,7 @@ samp {
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
*/
button,
@ -256,7 +260,7 @@ textarea {
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10.
* Address `overflow` set to `hidden` in IE 8/9/10/11.
*/
button {
@ -266,7 +270,7 @@ button {
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8+, and Opera
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
* Correct `select` style inheritance in Firefox.
*/
@ -345,8 +349,8 @@ input[type="number"]::-webkit-outer-spin-button {
}
/**
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
* (include `-moz` to future-proof).
*/
@ -379,7 +383,7 @@ fieldset {
}
/**
* 1. Correct `color` not being inherited in IE 8/9.
* 1. Correct `color` not being inherited in IE 8/9/10/11.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
@ -389,7 +393,7 @@ legend {
}
/**
* Remove default vertical scrollbar in IE 8/9.
* Remove default vertical scrollbar in IE 8/9/10/11.
*/
textarea {
@ -597,6 +601,12 @@ ul.tabs li a.active {background-color:#ffffff;color:#282e32;border:1px solid #46
.content ul li a {text-decoration:none;color:#3e4346;}
.content ul li a small {color:#8b959c;font-size:9px;text-transform:uppercase;font-family:Verdana, Arial, Helvetica, sans-serif;position:relative;left:4px;top:0px;}
.content ul li:last-child {border-bottom:none;}
table.liasse {width:100%;border-collapse:collapse;}
table.liasse th {border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align:center; }
table.liasse td.date {text-align:center;background-color:#2b2b8b;color:white;font-weight:bold;width:90px;}
table.liasse td {padding:8px 4px 8px 4px;border:1px solid #000000;vertical-align:top;}
table.liasse td.decision {min-width:150px;}
table.liasse td.type {min-width:250px;}
/* Géolocalisation
----------------------------------*/
@ -613,7 +623,6 @@ ul.tabs li a.active {background-color:#ffffff;color:#282e32;border:1px solid #46
#annoncesDate p {margin:0; line-height:16px; vertical-align:middle;}
#annoncesImg { float:right; border:0; margin:0 20px 0 0;}
#annoncesImg img {margin:0; border:0;}
.listeCompetences { margin:5px 5px 5px 50px;}
.listeCompetences li {margin:10px 5px 20px 5px;}
tr.deleted {text-decoration:line-through;}
@ -662,79 +671,81 @@ div.blocdegrade .echelleright{float:right;}
/* Surveillances
----------------------------------*/
#surveillance {width:100%;border-collapse:collapse; border:1px solid; font:normal 11px Arial, Verdana, Sans-serif; letter-spacing:1px;line-height: 1em;}
#surveillance tr {border:1px solid;}
#surveillance th {border:1px solid; padding:5px;font-weight:bold;}
#surveillance td {border:1px solid;text-align:center;padding:2px;}
#surveillance .aleft {text-align:left;}
#surveillance .action {clear:both; margin:0;padding:0; }
#surveillance td p {line-height:16px;margin: 0;}
#surveillance .action p {display:inline-block; float:left; line-height:16px; margin:0; font-size:11px;}
#surveillance .action a {display:inline-block; float:right;}
#surveillance .action img {vertical-align:middle;}
#surveillance #type {width:120px;}
#tri li {list-style-type:none; margin-left:10px; display:inline; font-size:11px; }
#surveillance { width:100%;border-collapse:collapse; border:1px solid; font:normal 11px Arial, Verdana, Sans-serif; letter-spacing:1px;line-height: 1em; }
#surveillance tr { border:1px solid; }
#surveillance th { border:1px solid; padding:5px;font-weight:bold; }
#surveillance td { border:1px solid;text-align:center;padding:2px; }
#surveillance .aleft { text-align:left; }
#surveillance .action { clear:both; margin:0;padding:0; }
#surveillance td p { line-height:16px;margin: 0; }
#surveillance .action p { display:inline-block; float:left; line-height:16px; margin:0; font-size:11px; }
#surveillance .action a { display:inline-block; float:right; }
#surveillance .action img { vertical-align:middle; }
#surveillance #type { width:120px; }
#tri li { list-style-type:none; margin-left:10px; display:inline; font-size:11px; }
.options { margin-left:10px; margin-top:5px; font-size:11px; }
#telechargementjsMsg { margin-left:10px; margin-top:5px; }
.valign img, .valign span {vertical-align: middle; display: inline-block;}
.valign img, .valign span { vertical-align: middle; display: inline-block; }
#surveillance td.encours { text-align:right; }
#surveillance th.score { width:60px; }
#surveillance td a.editencours { display:none; }
#formSurveillance input.search {border:1px solid; padding:3px 5px;width:200px;}
#formSurveillance input.search:focus {border:1px solid #4D90FE;}
#formSurveillance input.submit {font-weight:bold;padding:2px 5px; background-color:#4D90FE; border:1px solid #3079ED;color:#ffffff; }
#formSurveillance input.search { border:1px solid; padding:3px 5px;width:200px; }
#formSurveillance input.search:focus { border:1px solid #4D90FE; }
#formSurveillance input.submit { font-weight:bold;padding:2px 5px; background-color:#4D90FE; border:1px solid #3079ED;color:#ffffff; }
/* Pieces
----------------------------------*/
.marge {margin-left:30px;}
.marge { margin-left:30px; }
/*#identite { margin-left:30px; }*/
form em { color:#FF0000;}
fieldset {border:0; margin:0; padding:0;}
fieldset legend{ padding:0 0 0 10px;}
.fieldgrp{clear:both; margin:0 0 .5em 30px; overflow:hidden;}
.fieldgrp:after{content:"."; display:block; clear:both; visibility:hidden; line-height:0; height:0; }
.fieldgrp label{font-weight:bold; margin-left:30px; width:100px; clear:both; padding:0 10px 0 0; line-height:22px;_padding-top:3px; float:left; display:block; font-size:108%;}
.fieldgrp label span{font-weight:normal;}
.fieldgrp label abbr{color:#4B911C; font-size:120%; vertical-align:middle;}
.field { float:left; padding:0 5px 0 0; line-height:22px; _padding-top:3px;}
.field .longfield{width:215px;}
.field .longfield-select{width:220px;}
.field .smallfield{width:95px;}
.field .medfield{width:110px;}
form em { color:#FF0000; }
fieldset { border:0; margin:0; padding:0; }
fieldset legend { padding:0 0 0 10px; }
.fieldgrp { clear:both; margin:0 0 .5em 30px; overflow:hidden; }
.fieldgrp:after { content:"."; display:block; clear:both; visibility:hidden; line-height:0; height:0; }
.fieldgrp label { font-weight:bold; margin-left:30px; width:100px; clear:both; padding:0 10px 0 0; line-height:22px;_padding-top:3px; float:left; display:block; font-size:108%; }
.fieldgrp label span { font-weight:normal;}
.fieldgrp label abbr { color:#4B911C; font-size:120%; vertical-align:middle;}
.field { float:left; padding:0 5px 0 0; line-height:22px; _padding-top:3px; }
.field .longfield { width:215px; }
.field .longfield-select { width:220px; }
.field .smallfield { width:95px; }
.field .medfield { width:110px; }
.field span { display:block; }
.field input, .field select{font-size:110%; margin:2px 0;}
.field input[type="radio"] {margin:0 5px 0 5px; border:0;}
input[type="checkbox"] {margin:0 5px 0 5px; border:0;}
.submit {text-align:center;}
.noborder {border:none;}
#message {margin:10px 0 10px 30px;}
table.greffe {width:100%;border-collapse:collapse;}
table.greffe th {border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align:center; }
table.greffe td.date {text-align:center;background-color:#2b2b8b;color:white;font-weight:bold;width:90px;}
table.greffe td {padding:8px 4px 8px 4px;border:1px solid #000000;border-bottom: 1px dashed; vertical-align:top;}
table.greffe td.decision {min-width:150px;}
table.greffe td.type {min-width:250px;}
table.greffe td.saisie {border-top: 1px dashed;}
/* Kbis
----------------------------------*/
/* progress bar container */
#progressbar {border:1px solid black;width:200px;height:20px;position:relative;color:black;}
/* color bar */
#progressbar div.progress {position:absolute;width:0;height:100%;overflow:hidden;background-color:#369;}
/* text on bar */
#progressbar div.progress .text {position:absolute;text-align:center;color:white;}
/* text off bar */
#progressbar div.text {position:absolute;width:100%;height:100%;text-align:center;}
.field input, .field select { font-size:110%; margin:2px 0; }
.field input[type="radio"] { margin:0 5px 0 5px; border:0; }
input[type="checkbox"] { margin:0 5px 0 5px; border:0; }
.submit { text-align:center; }
.noborder { border:none; }
#message { margin:10px 0 10px 30px; }
table.greffe { width:100%;border-collapse:collapse; }
table.greffe th { border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align:center; }
table.greffe td.date { text-align:center;background-color:#2b2b8b;color:white;font-weight:bold;width:90px; }
table.greffe td { padding:8px 4px 8px 4px;border:1px solid #000000;border-bottom: 1px dashed; vertical-align:top; }
table.greffe td.decision { min-width:150px; }
table.greffe td.type { min-width:250px; }
table.greffe td.saisie { border-top: 1px dashed; }
/* Print
----------------------------------*/
@media print {
body {font-family:Verdana, Arial, sans-serif;font-size: 11px;}
#global {width:auto !important;text-align:left;}
#content {margin:0; padding:0; width:auto; }
table {page-break-inside:avoid}
div.paragraph {page-break-inside:avoid}
div#menu {display:none;}
@page {
size: portrait;
margin: 1cm;
};
h1 {
page-break-before: always;
}
table {
page-break-before: avoid;
page-break-inside: avoid;
}
body { background-color:#ffffff; font-family:Verdana, Arial, sans-serif; font-size:11px; }
global { width:100% !important; margin:0; }
#content { float:none; clear:none; width:100% !important; padding:0; margin:0; }
div#menu { display:none; }
#center { padding:0; }
h1 { letter-spacing:none; }
#footer { clear:both; text-align:center; margin-top:15px; }
}

4
library/Application/Controller/Plugin/Theme.php
View File

@ -90,7 +90,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
*/
if ( $UserLogin ) {
$view->headLink()
->appendStylesheet('/libs/bootstrap-3.3.1/css/bootstrap.min.css', 'all')
->appendStylesheet('/libs/bootstrap-3.3.2/css/bootstrap.min.css', 'all')
->appendStylesheet('/themes/default/styles/user-login.css', 'all');
} else {
$view->headLink()->appendStylesheet($paramsTheme->pathStyle.'/main.css', 'all');
@ -116,7 +116,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
->appendFile('/libs/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
->appendFile('/libs/jquery/jquery-1.11.2.min.js', 'text/javascript')
->appendFile('/libs/jquery/jquery.placeholder.js', 'text/javascript')
->appendFile('/libs/bootstrap-3.3.1/js/bootstrap.min.js', 'text/javascript');
->appendFile('/libs/bootstrap-3.3.2/js/bootstrap.min.js', 'text/javascript');
} else {
$view->headScript()
->appendFile('/libs/jquery/jquery-1.11.2.min.js', 'text/javascript');

7
library/Scores/Export/Print.php
View File

@ -17,7 +17,7 @@ class Scores_Export_Print
'finance-synthese' => 'siret,id,typeBilan',
'finance-bilan' => 'siret,id,typeBilan',
'finance-ratios' => 'siret,id,typeBilan,mil',
'finance-liasse' => 'siret,id,unit,date',
'finance-liasse' => 'siret,id,date',
'finance-bourse' => 'siret,id',
'finance-banque' => 'siret,id',
'juridique-annonces' => 'siret,id,idAnn,vue,p',
@ -53,7 +53,7 @@ class Scores_Export_Print
'finance-synthese' => 'siret,id,typeBilan',
'finance-bilan' => 'siret,id,typeBilan',
'finance-ratios' => 'siret,id,typeBilan,mil',
'finance-liasse' => 'siret,id,unit,date',
'finance-liasse' => 'siret,id,date',
'finance-bourse' => 'siret,id',
'finance-banque' => 'siret,id',
'juridique-annonces' => 'siret,id,idAnn,vue,p',
@ -87,7 +87,7 @@ class Scores_Export_Print
'finance-synthese' => 'siret,id,typeBilan',
'finance-bilan' => 'siret,id,typeBilan',
'finance-ratios' => 'siret,id,typeBilan,mil',
'finance-liasse' => 'siret,id,unit,date',
'finance-liasse' => 'siret,id,date',
'finance-bourse' => 'siret,id',
'finance-banque' => 'siret,id',
'juridique-annonces' => 'siret,id,idAnn,vue,p',
@ -95,7 +95,6 @@ class Scores_Export_Print
'juridique-competences' => 'siret,id,type',
'juridique-marques' => 'siret,id,idObject',
'evaluation-indiscore' => 'siret,id',
'evaluation-indiscore2' => 'siret,id',
'evaluation-indiscore3' => 'siret,id',
'evaluation-valorisation' => 'siret,id',
'evaluation-scoreshisto' => 'siret,id,type',

68
library/Scores/Finance/Liasse.php
View File

@ -103,11 +103,6 @@ class Scores_Finance_Liasse
'BK1' => '049',
'BK2' => 'N04',
'BL' => '050',
'BM' => '052',
'BM1' => '053',
'BM2' => 'N05',
'BT' => '060',
'BU' => '062',
'BU1' => '063',
@ -321,7 +316,7 @@ class Scores_Finance_Liasse
$bilanRN=array();
foreach ($tabBS2BN as $posteRN => $formule) {
if (preg_match('/\+|\-/', $formule)) {
$tabTmp=preg_split('/\+|\-/', $formule, -1, PREG_SPLIT_OFFSET_CAPTURE);
$tabTmp = preg_split('/\+|\-/', $formule, -1, PREG_SPLIT_OFFSET_CAPTURE);
//$bilanRN[$posteRN]=0;
$scalc='';
foreach ($tabTmp as $i=>$tab) {
@ -341,38 +336,53 @@ class Scores_Finance_Liasse
}
else $bilanRN[$posteRN]=$bilanRS[$formule];
}
if ( $bilanRS['240']<>0 ) {
$bilanRN['BL']=$bilanRS['050'];
$bilanRN['BM']=$bilanRS['052'];
//Variation de stock (matières premières et approvisionnement)
if ( is_numeric($bilanRS['240']) && $bilanRS['240'] != 0 ) {
$bilanRN['BL'] = $bilanRS['050'];
$bilanRN['BM'] = $bilanRS['052'];
$bilanRN['BM1'] = $bilanRS['053'];
$bilanRN['BM2'] = $bilanRS['N05'];
unset($bilanRN['BN']);
unset($bilanRN['BO']);
unset($bilanRN['BO1']);
unset($bilanRN['BO2']);
} else {
$bilanRN['BN']=$bilanRS['050'];
$bilanRN['BO']=$bilanRS['052'];
unset($bilanRN['BL']);
unset($bilanRN['BM']);
unset($bilanRN['BM1']);
unset($bilanRN['BM2']);
$bilanRN['BN'] = $bilanRS['050'];
$bilanRN['BO'] = $bilanRS['052'];
$bilanRN['BO1'] = $bilanRS['053'];
$bilanRN['BO2'] = $bilanRS['N05'];
}
if ( $bilanRS['070']<>0 || $bilanRS['074']<>0 || $bilanRS['052']<>0 || $bilanRS['062']<>0 ) {
$bilanRN['GC']=$bilanRS['256'];
} elseif ($bilanRS['070']==0 && $bilanRS['074']==0 && $bilanRS['052']==0 && $bilanRS['062']==0 && $bilanRS['254']<>0 ) {
$bilanRN['GD']=$bilanRS['256'];
if ( is_numeric($bilanRS['070']) && $bilanRS['070'] != 0
|| is_numeric($bilanRS['074']) && $bilanRS['074'] != 0
|| is_numeric($bilanRS['052']) && $bilanRS['052'] != 0
|| is_numeric($bilanRS['062']) && $bilanRS['062'] != 0 ) {
$bilanRN['GC'] = $bilanRS['256'];
} elseif ( $bilanRS['070'] == 0
&& $bilanRS['074'] == 0
&& $bilanRS['052'] == 0
&& $bilanRS['062'] == 0
&& intval($bilanRS['254']) > 0 ) {
$bilanRN['GD'] = $bilanRS['256'];
}
if ( $bilanRS['071']<>0 || $bilanRS['075']<>0 || $bilanRS['053']<>0 || $bilanRS['063']<>0 ) {
$bilanRN['GC1']=$bilanRS['N50'];
} elseif ($bilanRS['071']==0 || $bilanRS['075']==0 || $bilanRS['053']==0 || $bilanRS['063']==0 && $bilanRS['N49']<>0 ) {
$bilanRN['GD1']=$bilanRS['N50'];
}
if ( $bilanRS['584']<>0 ) {
$bilanRN['HB']=$bilanRS['584'];
$bilanRN['HA']=$bilanRS['290']-$bilanRS['584'];
if ( is_numeric($bilanRS['584']) && $bilanRS['584'] != 0 ) {
$bilanRN['HB'] = $bilanRS['584'];
$bilanRN['HA'] = $bilanRS['290'] - $bilanRS['584'];
} else {
$bilanRN['HA']=$bilanRS['290'];
$bilanRN['HA'] = $bilanRS['290'];
}
if ( $bilanRS['582']<>0 ) {
$bilanRN['HF']=$bilanRS['582'];
$bilanRN['HE']=$bilanRS['582']-$bilanRS['300'];
if ( is_numeric($bilanRS['582']) && $bilanRS['582'] != 0 ) {
$bilanRN['HF'] = $bilanRS['582'];
$bilanRN['HE'] = $bilanRS['582'] - $bilanRS['300'];
} else {
$bilanRN['HE']=$bilanRS['300'];
$bilanRN['HE'] = $bilanRS['300'];
}
return $bilanRN;

4
library/Zend/Acl.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -53,7 +53,7 @@ require_once 'Zend/Acl/Resource.php';
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl

4
library/Zend/Acl/Assert/Interface.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -41,7 +41,7 @@ require_once 'Zend/Acl/Resource/Interface.php';
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Acl_Assert_Interface

4
library/Zend/Acl/Exception.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Exception extends Zend_Exception

5
library/Zend/Acl/Resource.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -29,7 +29,7 @@ require_once 'Zend/Acl/Resource/Interface.php';
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Resource implements Zend_Acl_Resource_Interface
@ -45,7 +45,6 @@ class Zend_Acl_Resource implements Zend_Acl_Resource_Interface
* Sets the Resource identifier
*
* @param string $resourceId
* @return void
*/
public function __construct($resourceId)
{

4
library/Zend/Acl/Resource/Interface.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -23,7 +23,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Acl_Resource_Interface

5
library/Zend/Acl/Role.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -29,7 +29,7 @@ require_once 'Zend/Acl/Role/Interface.php';
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Role implements Zend_Acl_Role_Interface
@ -45,7 +45,6 @@ class Zend_Acl_Role implements Zend_Acl_Role_Interface
* Sets the Role identifier
*
* @param string $roleId
* @return void
*/
public function __construct($roleId)
{

4
library/Zend/Acl/Role/Interface.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -23,7 +23,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Acl_Role_Interface

4
library/Zend/Acl/Role/Registry.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -29,7 +29,7 @@ require_once 'Zend/Acl/Role/Interface.php';
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Role_Registry

4
library/Zend/Acl/Role/Registry/Exception.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -29,7 +29,7 @@ require_once 'Zend/Acl/Exception.php';
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception

4
library/Zend/Amf/Adobe/Auth.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -36,7 +36,7 @@ require_once 'Zend/Xml/Security.php';
*
* @package Zend_Amf
* @subpackage Adobe
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract

4
library/Zend/Amf/Adobe/DbInspector.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -24,7 +24,7 @@
*
* @package Zend_Amf
* @subpackage Adobe
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Adobe_DbInspector

4
library/Zend/Amf/Adobe/Introspector.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Server/Reflection.php';
*
* @package Zend_Amf
* @subpackage Adobe
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Adobe_Introspector

4
library/Zend/Amf/Auth/Abstract.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -27,7 +27,7 @@ require_once 'Zend/Auth/Adapter/Interface.php';
*
* @package Zend_Amf
* @subpackage Auth
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface

4
library/Zend/Amf/Constants.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -24,7 +24,7 @@
* deserialization to detect the AMF marker and encoding types.
*
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
final class Zend_Amf_Constants

4
library/Zend/Amf/Exception.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@ require_once 'Zend/Exception.php';
/**
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Exception extends Zend_Exception

4
library/Zend/Amf/Parse/Amf0/Deserializer.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -36,7 +36,7 @@ require_once 'Zend/Amf/Parse/Deserializer.php';
* @todo Class could be implemented as Factory Class with each data type it's own class
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer

4
library/Zend/Amf/Parse/Amf0/Serializer.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Amf/Parse/Serializer.php';
* @uses Zend_Amf_Parse_Serializer
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer

4
library/Zend/Amf/Parse/Amf3/Deserializer.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse_Amf3
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -37,7 +37,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php';
* @todo Class could be implemented as Factory Class with each data type it's own class.
* @package Zend_Amf
* @subpackage Parse_Amf3
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer

4
library/Zend/Amf/Parse/Amf3/Serializer.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse_Amf3
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -35,7 +35,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php';
*
* @package Zend_Amf
* @subpackage Parse_Amf3
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer

4
library/Zend/Amf/Parse/Deserializer.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -30,7 +30,7 @@
* @see http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Amf_Parse_Deserializer

4
library/Zend/Amf/Parse/InputStream.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -31,7 +31,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php';
*
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream

4
library/Zend/Amf/Parse/OutputStream.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php';
* @uses Zend_Amf_Util_BinaryStream
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream

4
library/Zend/Amf/Parse/Resource/MysqlResult.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
*
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Resource_MysqlResult

4
library/Zend/Amf/Parse/Resource/MysqliResult.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
*
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Resource_MysqliResult

4
library/Zend/Amf/Parse/Resource/Stream.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -25,7 +25,7 @@
*
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Resource_Stream

4
library/Zend/Amf/Parse/Serializer.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -25,7 +25,7 @@
*
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Amf_Parse_Serializer

4
library/Zend/Amf/Parse/TypeLoader.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -47,7 +47,7 @@ require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php';
* @todo PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace
* @package Zend_Amf
* @subpackage Parse
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
final class Zend_Amf_Parse_TypeLoader

4
library/Zend/Amf/Request.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -40,7 +40,7 @@ require_once 'Zend/Amf/Value/MessageBody.php';
*
* @todo Currently not checking if the object needs to be Type Mapped to a server object.
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Request

4
library/Zend/Amf/Request/Http.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Request
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Amf/Request.php';
*
* @package Zend_Amf
* @subpackage Request
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Request_Http extends Zend_Amf_Request

4
library/Zend/Amf/Response.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Amf/Parse/Amf0/Serializer.php';
* Handles converting the PHP object ready for response back into AMF
*
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Response

4
library/Zend/Amf/Response/Http.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Response
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -28,7 +28,7 @@ require_once 'Zend/Amf/Response.php';
*
* @package Zend_Amf
* @subpackage Response
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Response_Http extends Zend_Amf_Response

4
library/Zend/Amf/Server.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -52,7 +52,7 @@ require_once 'Zend/Auth.php';
* @todo Make the reflection methods cache and autoload.
* @package Zend_Amf
* @subpackage Server
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Server implements Zend_Server_Interface

4
library/Zend/Amf/Server/Exception.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Server
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -29,7 +29,7 @@ require_once 'Zend/Amf/Exception.php';
* @category Zend
* @package Zend_Amf
* @subpackage Server
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Server_Exception extends Zend_Amf_Exception

4
library/Zend/Amf/Util/BinaryStream.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Util
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -25,7 +25,7 @@
*
* @package Zend_Amf
* @subpackage Util
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Util_BinaryStream

4
library/Zend/Amf/Value/ByteArray.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -25,7 +25,7 @@
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_ByteArray

4
library/Zend/Amf/Value/MessageBody.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_MessageBody

4
library/Zend/Amf/Value/MessageHeader.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -28,7 +28,7 @@
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_MessageHeader

4
library/Zend/Amf/Value/Messaging/AbstractMessage.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_Messaging_AbstractMessage

4
library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage

4
library/Zend/Amf/Value/Messaging/ArrayCollection.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -27,7 +27,7 @@
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_Messaging_ArrayCollection extends ArrayObject

4
library/Zend/Amf/Value/Messaging/AsyncMessage.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage

4
library/Zend/Amf/Value/Messaging/CommandMessage.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -36,7 +36,7 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage

4
library/Zend/Amf/Value/Messaging/ErrorMessage.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage

4
library/Zend/Amf/Value/Messaging/RemotingMessage.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -31,7 +31,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage

4
library/Zend/Amf/Value/TraitsInfo.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -25,7 +25,7 @@
*
* @package Zend_Amf
* @subpackage Value
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Value_TraitsInfo

43
library/Zend/Application.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Application
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -22,7 +22,7 @@
/**
* @category Zend
* @package Zend_Application
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application
@ -86,7 +86,10 @@ class Zend_Application
} elseif ($options instanceof Zend_Config) {
$options = $options->toArray();
} elseif (!is_array($options)) {
throw new Zend_Application_Exception('Invalid options provided; must be location of config file, a config object, or an array');
throw new Zend_Application_Exception(
'Invalid options provided; must be location of config file,'
. ' a config object, or an array'
);
}
$this->setOptions($options);
@ -127,11 +130,15 @@ class Zend_Application
if (is_array($options['config'])) {
$_options = array();
foreach ($options['config'] as $tmp) {
$_options = $this->mergeOptions($_options, $this->_loadConfig($tmp));
$_options = $this->mergeOptions(
$_options, $this->_loadConfig($tmp)
);
}
$options = $this->mergeOptions($_options, $options);
} else {
$options = $this->mergeOptions($this->_loadConfig($options['config']), $options);
$options = $this->mergeOptions(
$this->_loadConfig($options['config']), $options
);
}
}
@ -171,7 +178,9 @@ class Zend_Application
$this->setBootstrap($bootstrap);
} elseif (is_array($bootstrap)) {
if (empty($bootstrap['path'])) {
throw new Zend_Application_Exception('No bootstrap path provided');
throw new Zend_Application_Exception(
'No bootstrap path provided'
);
}
$path = $bootstrap['path'];
@ -183,7 +192,9 @@ class Zend_Application
$this->setBootstrap($path, $class);
} else {
throw new Zend_Application_Exception('Invalid bootstrap information provided');
throw new Zend_Application_Exception(
'Invalid bootstrap information provided'
);
}
}
@ -319,13 +330,18 @@ class Zend_Application
if (!class_exists($class, false)) {
require_once $path;
if (!class_exists($class, false)) {
throw new Zend_Application_Exception('Bootstrap class not found');
throw new Zend_Application_Exception(
'Bootstrap class not found'
);
}
}
$this->_bootstrap = new $class($this);
if (!$this->_bootstrap instanceof Zend_Application_Bootstrap_Bootstrapper) {
throw new Zend_Application_Exception('Bootstrap class does not implement Zend_Application_Bootstrap_Bootstrapper');
throw new Zend_Application_Exception(
'Bootstrap class does not implement'
. ' Zend_Application_Bootstrap_Bootstrapper'
);
}
return $this;
@ -403,13 +419,18 @@ class Zend_Application
case 'inc':
$config = include $file;
if (!is_array($config)) {
throw new Zend_Application_Exception('Invalid configuration file provided; PHP file does not return array value');
throw new Zend_Application_Exception(
'Invalid configuration file provided; PHP file does not'
. ' return array value'
);
}
return $config;
break;
default:
throw new Zend_Application_Exception('Invalid configuration file provided; unknown config type');
throw new Zend_Application_Exception(
'Invalid configuration file provided; unknown config type'
);
}
return $config->toArray();

26
library/Zend/Application/Bootstrap/Bootstrap.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -34,7 +34,7 @@ require_once 'Zend/Application/Bootstrap/BootstrapAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Bootstrap_Bootstrap
@ -64,9 +64,13 @@ class Zend_Application_Bootstrap_Bootstrap
parent::__construct($application);
if ($application->hasOption('resourceloader')) {
$this->setOptions(array(
'resourceloader' => $application->getOption('resourceloader')
));
$this->setOptions(
array(
'resourceloader' => $application->getOption(
'resourceloader'
)
)
);
}
$this->getResourceLoader();
@ -128,10 +132,14 @@ class Zend_Application_Bootstrap_Bootstrap
) {
$r = new ReflectionClass($this);
$path = $r->getFileName();
$this->setResourceLoader(new Zend_Application_Module_Autoloader(array(
'namespace' => $namespace,
'basePath' => dirname($path),
)));
$this->setResourceLoader(
new Zend_Application_Module_Autoloader(
array(
'namespace' => $namespace,
'basePath' => dirname($path),
)
)
);
}
return $this->_resourceLoader;
}

4
library/Zend/Application/Bootstrap/BootstrapAbstract.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -38,7 +38,7 @@ require_once 'Zend/Application/Bootstrap/ResourceBootstrapper.php';
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Application_Bootstrap_BootstrapAbstract

4
library/Zend/Application/Bootstrap/Bootstrapper.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Application_Bootstrap_Bootstrapper

4
library/Zend/Application/Bootstrap/Exception.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Application
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -30,7 +30,7 @@ require_once 'Zend/Application/Exception.php';
* @category Zend
* @package Zend_Application
* @uses Zend_Application_Exception
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Bootstrap_Exception extends Zend_Application_Exception

4
library/Zend/Application/Bootstrap/ResourceBootstrapper.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Bootstrap
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Application_Bootstrap_ResourceBootstrapper

4
library/Zend/Application/Exception.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Application
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -30,7 +30,7 @@ require_once 'Zend/Exception.php';
* @uses Zend_Exception
* @category Zend
* @package Zend_Application
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Exception extends Zend_Exception

75
library/Zend/Application/Module/Autoloader.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Module
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -30,7 +30,7 @@ require_once 'Zend/Loader/Autoloader/Resource.php';
* @category Zend
* @package Zend_Application
* @subpackage Module
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource
@ -39,7 +39,6 @@ class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource
* Constructor
*
* @param array|Zend_Config $options
* @return void
*/
public function __construct($options)
{
@ -55,40 +54,42 @@ class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource
public function initDefaultResourceTypes()
{
$basePath = $this->getBasePath();
$this->addResourceTypes(array(
'dbtable' => array(
'namespace' => 'Model_DbTable',
'path' => 'models/DbTable',
),
'mappers' => array(
'namespace' => 'Model_Mapper',
'path' => 'models/mappers',
),
'form' => array(
'namespace' => 'Form',
'path' => 'forms',
),
'model' => array(
'namespace' => 'Model',
'path' => 'models',
),
'plugin' => array(
'namespace' => 'Plugin',
'path' => 'plugins',
),
'service' => array(
'namespace' => 'Service',
'path' => 'services',
),
'viewhelper' => array(
'namespace' => 'View_Helper',
'path' => 'views/helpers',
),
'viewfilter' => array(
'namespace' => 'View_Filter',
'path' => 'views/filters',
),
));
$this->addResourceTypes(
array(
'dbtable' => array(
'namespace' => 'Model_DbTable',
'path' => 'models/DbTable',
),
'mappers' => array(
'namespace' => 'Model_Mapper',
'path' => 'models/mappers',
),
'form' => array(
'namespace' => 'Form',
'path' => 'forms',
),
'model' => array(
'namespace' => 'Model',
'path' => 'models',
),
'plugin' => array(
'namespace' => 'Plugin',
'path' => 'plugins',
),
'service' => array(
'namespace' => 'Service',
'path' => 'services',
),
'viewhelper' => array(
'namespace' => 'View_Helper',
'path' => 'views/helpers',
),
'viewfilter' => array(
'namespace' => 'View_Filter',
'path' => 'views/filters',
),
)
);
$this->setDefaultResourceType('model');
}
}

7
library/Zend/Application/Module/Bootstrap.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Module
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Bootstrap/Bootstrap.php';
* @category Zend
* @package Zend_Application
* @subpackage Module
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Application_Module_Bootstrap
@ -48,8 +48,7 @@ abstract class Zend_Application_Module_Bootstrap
/**
* Constructor
*
* @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
* @return void
* @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
*/
public function __construct($application)
{

4
library/Zend/Application/Resource/Cachemanager.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -28,7 +28,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Cachemanager extends Zend_Application_Resource_ResourceAbstract

12
library/Zend/Application/Resource/Db.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbstract
@ -88,7 +88,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
/**
* Set the adapter params
*
* @param string $adapter
* @param array $params
* @return Zend_Application_Resource_Db
*/
public function setParams(array $params)
@ -110,7 +110,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
/**
* Set whether to use this as default table adapter
*
* @param boolean $defaultTableAdapter
* @param bool $isDefaultTableAdapter
* @return Zend_Application_Resource_Db
*/
public function setIsDefaultTableAdapter($isDefaultTableAdapter)
@ -122,7 +122,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
/**
* Is this adapter the default table adapter?
*
* @return void
* @return bool
*/
public function isDefaultTableAdapter()
{
@ -160,6 +160,8 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
if (null !== ($db = $this->getDbAdapter())) {
return $db;
}
return null;
}
/**

4
library/Zend/Application/Resource/Dojo.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Dojo

4
library/Zend/Application/Resource/Exception.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Application/Exception.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Exception extends Zend_Application_Exception

18
library/Zend/Application/Resource/Frontcontroller.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resource_ResourceAbstract
@ -46,6 +46,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
* Initialize Front Controller
*
* @return Zend_Controller_Front
* @throws Zend_Application_Exception
*/
public function init()
{
@ -71,7 +72,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
if (is_string($value)) {
$front->addModuleDirectory($value);
} elseif (is_array($value)) {
foreach($value as $moduleDir) {
foreach ($value as $moduleDir) {
$front->addModuleDirectory($moduleDir);
}
}
@ -102,11 +103,10 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
case 'plugins':
foreach ((array) $value as $pluginClass) {
$stackIndex = null;
if(is_array($pluginClass)) {
if (is_array($pluginClass)) {
$pluginClass = array_change_key_case($pluginClass, CASE_LOWER);
if(isset($pluginClass['class']))
{
if(isset($pluginClass['stackindex'])) {
if (isset($pluginClass['class'])) {
if (isset($pluginClass['stackindex'])) {
$stackIndex = $pluginClass['stackindex'];
}
@ -136,7 +136,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
break;
case 'dispatcher':
if(!isset($value['class'])) {
if (!isset($value['class'])) {
require_once 'Zend/Application/Exception.php';
throw new Zend_Application_Exception('You must specify both ');
}
@ -145,7 +145,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
}
$dispatchClass = $value['class'];
if(!class_exists($dispatchClass)) {
if (!class_exists($dispatchClass)) {
require_once 'Zend/Application/Exception.php';
throw new Zend_Application_Exception('Dispatcher class not found!');
}

4
library/Zend/Application/Resource/Layout.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Layout

10
library/Zend/Application/Resource/Locale.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Locale
@ -68,9 +68,9 @@ class Zend_Application_Resource_Locale
if (!isset($options['default'])) {
$this->_locale = new Zend_Locale();
} elseif(!isset($options['force']) ||
(bool) $options['force'] == false)
{
} elseif (!isset($options['force'])
|| (bool)$options['force'] == false
) {
// Don't force any locale, just go for auto detection
Zend_Locale::setDefault($options['default']);
$this->_locale = new Zend_Locale();

4
library/Zend/Application/Resource/Log.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Log

66
library/Zend/Application/Resource/Mail.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceAbstract
@ -43,7 +43,8 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
*/
protected $_transport;
public function init() {
public function init()
{
return $this->getMail();
}
@ -55,21 +56,21 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
{
if (null === $this->_transport) {
$options = $this->getOptions();
foreach($options as $key => $option) {
foreach ($options as $key => $option) {
$options[strtolower($key)] = $option;
}
$this->setOptions($options);
if(isset($options['transport']) &&
!is_numeric($options['transport']))
{
if (isset($options['transport'])
&& !is_numeric($options['transport'])
) {
$this->_transport = $this->_setupTransport($options['transport']);
if(!isset($options['transport']['register']) ||
$options['transport']['register'] == '1' ||
(isset($options['transport']['register']) &&
!is_numeric($options['transport']['register']) &&
(bool) $options['transport']['register'] == true))
{
if (!isset($options['transport']['register'])
|| $options['transport']['register'] == '1'
|| (isset($options['transport']['register'])
&& !is_numeric($options['transport']['register'])
&& (bool)$options['transport']['register'] == true)
) {
Zend_Mail::setDefaultTransport($this->_transport);
}
}
@ -81,19 +82,23 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
return $this->_transport;
}
protected function _setDefaults($type) {
protected function _setDefaults($type)
{
$key = strtolower('default' . $type);
$options = $this->getOptions();
if(isset($options[$key]['email']) &&
!is_numeric($options[$key]['email']))
{
if (isset($options[$key]['email'])
&& !is_numeric($options[$key]['email'])
) {
$method = array('Zend_Mail', 'setDefault' . ucfirst($type));
if(isset($options[$key]['name']) &&
!is_numeric($options[$key]['name']))
{
call_user_func($method, $options[$key]['email'],
$options[$key]['name']);
if (isset($options[$key]['name'])
&& !is_numeric(
$options[$key]['name']
)
) {
call_user_func(
$method, $options[$key]['email'], $options[$key]['name']
);
} else {
call_user_func($method, $options[$key]['email']);
}
@ -102,19 +107,17 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
protected function _setupTransport($options)
{
if(!isset($options['type'])) {
if (!isset($options['type'])) {
$options['type'] = 'sendmail';
}
$transportName = $options['type'];
if(!Zend_Loader_Autoloader::autoload($transportName))
{
if (!Zend_Loader_Autoloader::autoload($transportName)) {
$transportName = ucfirst(strtolower($transportName));
if(!Zend_Loader_Autoloader::autoload($transportName))
{
if (!Zend_Loader_Autoloader::autoload($transportName)) {
$transportName = 'Zend_Mail_Transport_' . $transportName;
if(!Zend_Loader_Autoloader::autoload($transportName)) {
if (!Zend_Loader_Autoloader::autoload($transportName)) {
throw new Zend_Application_Resource_Exception(
"Specified Mail Transport '{$transportName}'"
. 'could not be found'
@ -128,10 +131,11 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
switch($transportName) {
case 'Zend_Mail_Transport_Smtp':
if(!isset($options['host'])) {
if (!isset($options['host'])) {
throw new Zend_Application_Resource_Exception(
'A host is necessary for smtp transport,'
.' but none was given');
. ' but none was given'
);
}
$transport = new $transportName($options['host'], $options);

27
library/Zend/Application/Resource/Modules.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Modules extends Zend_Application_Resource_ResourceAbstract
@ -46,7 +46,6 @@ class Zend_Application_Resource_Modules extends Zend_Application_Resource_Resour
* Constructor
*
* @param mixed $options
* @return void
*/
public function __construct($options = null)
{
@ -73,23 +72,27 @@ class Zend_Application_Resource_Modules extends Zend_Application_Resource_Resour
foreach ($modules as $module => $moduleDirectory) {
$bootstrapClass = $this->_formatModuleName($module) . '_Bootstrap';
if (!class_exists($bootstrapClass, false)) {
$bootstrapPath = dirname($moduleDirectory) . '/Bootstrap.php';
$bootstrapPath = dirname($moduleDirectory) . '/Bootstrap.php';
if (file_exists($bootstrapPath)) {
$eMsgTpl = 'Bootstrap file found for module "%s" but bootstrap class "%s" not found';
include_once $bootstrapPath;
if (($default != $module)
&& !class_exists($bootstrapClass, false)
) {
throw new Zend_Application_Resource_Exception(sprintf(
$eMsgTpl, $module, $bootstrapClass
));
throw new Zend_Application_Resource_Exception(
sprintf(
$eMsgTpl, $module, $bootstrapClass
)
);
} elseif ($default == $module) {
if (!class_exists($bootstrapClass, false)) {
$bootstrapClass = 'Bootstrap';
if (!class_exists($bootstrapClass, false)) {
throw new Zend_Application_Resource_Exception(sprintf(
$eMsgTpl, $module, $bootstrapClass
));
throw new Zend_Application_Resource_Exception(
sprintf(
$eMsgTpl, $module, $bootstrapClass
)
);
}
}
}
@ -117,9 +120,9 @@ class Zend_Application_Resource_Modules extends Zend_Application_Resource_Resour
protected function bootstrapBootstraps($bootstraps)
{
$bootstrap = $this->getBootstrap();
$out = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
$out = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
foreach($bootstraps as $module => $bootstrapClass) {
foreach ($bootstraps as $module => $bootstrapClass) {
$moduleBootstrap = new $bootstrapClass($bootstrap);
$moduleBootstrap->bootstrap();
$out[$module] = $moduleBootstrap;

6
library/Zend/Application/Resource/Multidb.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -51,7 +51,7 @@ require_once 'Zend/Db/Table.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Multidb extends Zend_Application_Resource_ResourceAbstract
@ -114,7 +114,7 @@ class Zend_Application_Resource_Multidb extends Zend_Application_Resource_Resour
*/
public function isDefault($db)
{
if(!$db instanceof Zend_Db_Adapter_Abstract) {
if (!$db instanceof Zend_Db_Adapter_Abstract) {
$db = $this->getDb($db);
}

23
library/Zend/Application/Resource/Navigation.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @author Dolf Schimmel
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -57,10 +57,12 @@ class Zend_Application_Resource_Navigation
if (!$this->_container) {
$options = $this->getOptions();
if(isset($options['defaultPageType'])) {
Zend_Navigation_Page::setDefaultPageType($options['defaultPageType']);
if (isset($options['defaultPageType'])) {
Zend_Navigation_Page::setDefaultPageType(
$options['defaultPageType']
);
}
$pages = isset($options['pages']) ? $options['pages'] : array();
$this->_container = new Zend_Navigation($pages);
}
@ -93,15 +95,16 @@ class Zend_Application_Resource_Navigation
protected function _storeRegistry()
{
$options = $this->getOptions();
if(isset($options['storage']['registry']['key']) &&
!is_numeric($options['storage']['registry']['key'])) // see ZF-7461
{
$key = $options['storage']['registry']['key'];
// see ZF-7461
if (isset($options['storage']['registry']['key'])
&& !is_numeric($options['storage']['registry']['key'])
) {
$key = $options['storage']['registry']['key'];
} else {
$key = self::DEFAULT_REGISTRY_KEY;
}
Zend_Registry::set($key,$this->getContainer());
Zend_Registry::set($key, $this->getContainer());
}
/**

5
library/Zend/Application/Resource/Resource.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Application_Resource_Resource
@ -37,7 +37,6 @@ interface Zend_Application_Resource_Resource
* Must take an optional single argument, $options.
*
* @param mixed $options
* @return void
*/
public function __construct($options = null);

4
library/Zend/Application/Resource/ResourceAbstract.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/Resource.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Application_Resource_Resource

4
library/Zend/Application/Resource/Router.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Router

5
library/Zend/Application/Resource/Session.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Session extends Zend_Application_Resource_ResourceAbstract
@ -62,6 +62,7 @@ class Zend_Application_Resource_Session extends Zend_Application_Resource_Resour
* Get session save handler
*
* @return Zend_Session_SaveHandler_Interface
* @throws Zend_Application_Resource_Exception
*/
public function getSaveHandler()
{

18
library/Zend/Application/Resource/Translate.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_Translate extends Zend_Application_Resource_ResourceAbstract
@ -93,7 +93,7 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso
}
if (isset($options['options'])) {
foreach($options['options'] as $key => $value) {
foreach ($options['options'] as $key => $value) {
$options[$key] = $value;
}
}
@ -118,13 +118,15 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso
: self::DEFAULT_REGISTRY_KEY;
unset($options['registry_key']);
if(Zend_Registry::isRegistered($key)) {
if (Zend_Registry::isRegistered($key)) {
$translate = Zend_Registry::get($key);
if(!$translate instanceof Zend_Translate) {
if (!$translate instanceof Zend_Translate) {
require_once 'Zend/Application/Resource/Exception.php';
throw new Zend_Application_Resource_Exception($key
. ' already registered in registry but is '
. 'no instance of Zend_Translate');
throw new Zend_Application_Resource_Exception(
$key
. ' already registered in registry but is '
. 'no instance of Zend_Translate'
);
}
$translate->addTranslation($options);

4
library/Zend/Application/Resource/Useragent.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -23,7 +23,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_ResourceAbstract

4
library/Zend/Application/Resource/View.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php';
* @category Zend
* @package Zend_Application
* @subpackage Resource
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Application_Resource_View extends Zend_Application_Resource_ResourceAbstract

4
library/Zend/Auth.php
View File

@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Auth
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -23,7 +23,7 @@
/**
* @category Zend
* @package Zend_Auth
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Auth

5
library/Zend/Auth/Adapter/DbTable.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Auth
* @subpackage Adapter
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -41,7 +41,7 @@ require_once 'Zend/Auth/Result.php';
* @category Zend
* @package Zend_Auth
* @subpackage Adapter
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
@ -132,7 +132,6 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
* @param string $identityColumn
* @param string $credentialColumn
* @param string $credentialTreatment
* @return void
*/
public function __construct(Zend_Db_Adapter_Abstract $zendDb = null, $tableName = null, $identityColumn = null,
$credentialColumn = null, $credentialTreatment = null)

5
library/Zend/Auth/Adapter/Digest.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Auth
* @subpackage Adapter
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -31,7 +31,7 @@ require_once 'Zend/Auth/Adapter/Interface.php';
* @category Zend
* @package Zend_Auth
* @subpackage Adapter
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface
@ -71,7 +71,6 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface
* @param mixed $realm
* @param mixed $username
* @param mixed $password
* @return void
*/
public function __construct($filename = null, $realm = null, $username = null, $password = null)
{

4
library/Zend/Auth/Adapter/Exception.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Auth
* @subpackage Adapter
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -31,7 +31,7 @@ require_once 'Zend/Auth/Exception.php';
* @category Zend
* @package Zend_Auth
* @subpackage Adapter
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Auth_Adapter_Exception extends Zend_Auth_Exception

5
library/Zend/Auth/Adapter/Http.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Auth
* @subpackage Zend_Auth_Adapter_Http
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -35,7 +35,7 @@ require_once 'Zend/Auth/Adapter/Interface.php';
* @category Zend
* @package Zend_Auth
* @subpackage Zend_Auth_Adapter_Http
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @todo Support auth-int
* @todo Track nonces, nonce-count, opaque for replay protection and stale support
@ -163,7 +163,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface
* 'alogrithm' => <string> See $_supportedAlgos. Default: MD5
* 'proxy_auth' => <bool> Whether to do authentication as a Proxy
* @throws Zend_Auth_Adapter_Exception
* @return void
*/
public function __construct(array $config)
{

4
library/Zend/Auth/Adapter/Http/Resolver/Exception.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Auth
* @subpackage Zend_Auth_Adapter_Http
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -33,7 +33,7 @@ require_once 'Zend/Auth/Exception.php';
* @category Zend
* @package Zend_Auth
* @subpackage Zend_Auth_Adapter_Http
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Auth_Adapter_Http_Resolver_Exception extends Zend_Auth_Exception

Some files were not shown because too many files have changed in this diff Show More