Merge branch 'zf3' into develop (a3761a1a) · Commits · open-source / sygal

.gitignore

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		/data/DoctrineModule/
		/data/DoctrineORMModule/
		.DS_Store
		/upload/*
		/upload
		/vendor
		/tmp/
		.~*
		No newline at end of file

bin/import-UCN.sh

deleted100755 → 0

+0 −18

Original line number	Diff line number	Diff line
		#!/bin/bash

		##########################################################################################
		# Script de lancement de l'import de toutes les données d'un établissement.
		##########################################################################################

		ETAB="UCN"

		php public/index.php import --service=structure --etablissement=${ETAB} && echo && \
		php public/index.php import --service=ecole-doctorale --etablissement=${ETAB} && echo && \
		php public/index.php import --service=unite-recherche --etablissement=${ETAB} && echo && \
		php public/index.php import --service=etablissement --etablissement=${ETAB} && echo && \
		php public/index.php import --service=individu --etablissement=${ETAB} && echo && \
		php public/index.php import --service=doctorant --etablissement=${ETAB} && echo && \
		php public/index.php import --service=these --etablissement=${ETAB} && echo && \
		php public/index.php import --service=role --etablissement=${ETAB} && echo && \
		php public/index.php import --service=acteur --etablissement=${ETAB} && echo && \
		php public/index.php import --service=variable --etablissement=${ETAB} && echo

bin/import-URN.sh

deleted100755 → 0

+0 −18

Original line number	Diff line number	Diff line
		#!/bin/bash

		##########################################################################################
		# Script de lancement de l'import de toutes les données d'un établissement.
		##########################################################################################

		ETAB="URN"

		php public/index.php import --service=structure --etablissement=${ETAB} && echo && \
		php public/index.php import --service=ecole-doctorale --etablissement=${ETAB} && echo && \
		php public/index.php import --service=unite-recherche --etablissement=${ETAB} && echo && \
		php public/index.php import --service=etablissement --etablissement=${ETAB} && echo && \
		php public/index.php import --service=individu --etablissement=${ETAB} && echo && \
		php public/index.php import --service=doctorant --etablissement=${ETAB} && echo && \
		php public/index.php import --service=these --etablissement=${ETAB} && echo && \
		php public/index.php import --service=role --etablissement=${ETAB} && echo && \
		php public/index.php import --service=acteur --etablissement=${ETAB} && echo && \
		php public/index.php import --service=variable --etablissement=${ETAB} && echo

bin/run-import.sh

0 → 100755

+27 −0

Original line number	Diff line number	Diff line
		#!/bin/bash

		#############################################################################################
		# Script de lancement de l'import et de la synchro pour un établissement.
		#############################################################################################
		#
		# Usage :
		# $ run-import.sh "UCN"
		#
		#############################################################################################

		usage() {
		cat << EOF
		Script de lancement de l'import et de la synchro pour un établissement.
		Usage: $0 <ETAB>
		EOF
		exit 0;
		}

		[[ -z "$1" ]] && usage

		ROOT_DIR=$(cd `dirname $0` && pwd)/..
		ETAB="$1"

		php "$ROOT_DIR"/public/index.php import-all --etablissement="$ETAB" --synchronize=0 --breakOnServiceNotFound=0 && \
		php "$ROOT_DIR"/public/index.php run synchro --all
		# >> "/tmp/cron_sygal_import_$1.log" 2>&1 && \

composer.json

+20 −14

Original line number	Diff line number	Diff line
		@@ -8,30 +8,30 @@
		}
		],
		"require-dev": {
		"unicaen/test": "^1.0",
		"unicaen/test": "^3.0",
		"zendframework/zend-developer-tools": "^1.0"
		},
		"require": {
		"ext-fileinfo": "*",
		"ext-json": "*",
		"ext-imagick": "*",
		"ext-intl": "*",
		"ext-readline": "*",
		"ext-gettext": "*",
		"ext-zip": "*",
		"unicaen/app": "^1.3",
		"unicaen/auth": "^1.3",
		"unicaen/faq": "^1.0",
		"unicaen/ldap": "^2.1",
		"unicaen/import": "1.0.13",
		"unicaen/leocarte": "^1.0",
		"unicaen/code": "^1.0",
		"unicaen/app": "^3.0",
		"unicaen/auth": "^3.0",
		"unicaen/bjy-authorize": "^3.0",
		"unicaen/db-import": "dev-master",
		"unicaen/faq": "^3.0",
		"unicaen/ldap": "^3.0",
		"unicaen/oracle": "^3.0",
		"unicaen/code": "^3.0",
		"ramsey/uuid": "^3.3",
		"mpdf/mpdf": "v6.1.3",
		"bjyoungblood/bjy-authorize": "dev-master",
		"guzzlehttp/guzzle": "^6.3",
		"webmozart/assert": "^1.3",
		"beberlei/assert": "^2.9",
		"unicaen/oracle": "^1.2"
		"zendframework/zend-feed": "^2.12"
		},
		"autoload": {
		"psr-0": {
		@@ -51,9 +51,15 @@
		},
		"scripts": {
		"post-install-cmd": [
		"mkdir -p data/DoctrineORMModule/Proxy ; chmod -R 777 data/DoctrineORMModule/Proxy",
		"mkdir -p upload ; chmod -R 777 upload",
		"mkdir -p vendor/mpdf/mpdf/ttfontdata ; chmod -R 777 vendor/mpdf/mpdf/ttfontdata"
		"cp -r vendor/unicaen/app/public/unicaen public/",
		"mkdir -p vendor/mpdf/mpdf/ttfontdata && chmod -R 777 vendor/mpdf/mpdf/ttfontdata",
		"mkdir -p data/cache && chmod -R 777 data/cache && rm -rf data/cache/*",
		"mkdir -p data/DoctrineModule/cache && chmod -R 777 data/DoctrineModule/cache && rm -rf data/DoctrineModule/cache/*",
		"mkdir -p data/DoctrineORMModule/Proxy && chmod -R 777 data/DoctrineORMModule/Proxy && rm -rf data/DoctrineORMModule/Proxy/*",
		"vendor/bin/doctrine-module orm:clear-cache:query &",
		"vendor/bin/doctrine-module orm:clear-cache:metadata &",
		"vendor/bin/doctrine-module orm:clear-cache:result &",
		"vendor/bin/doctrine-module orm:generate-proxies &"
		]
		}
		}